status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix base image path import in Windows setup 

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
Pedro Pombeiro 2019-03-26 11:03:06 +01:00
parent 119373ea33
commit 5553486d31
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -148,6 +148,7 @@ Status-Windows-x86_64.exe
/desktop/lib/* /desktop/lib/*
/desktop/modules/* /desktop/modules/*
/desktop/Makefile /desktop/Makefile
/desktop/graph_info.json
/desktop/run-app.bat /desktop/run-app.bat
/desktop/run-app.sh /desktop/run-app.sh
/desktop/CMakeFiles/ /desktop/CMakeFiles/

2
scripts/build-desktop.sh
View File

@ -206,7 +206,7 @@ function bundleWindows() {
fi fi
# TODO this needs to be fixed: status-react/issues/5378 # TODO this needs to be fixed: status-react/issues/5378
local windowsBaseImagePath="$(nix show-derivation -r -f $STATUSREACTPATH | jq -r '.[] | select(.env.name=="StatusIm-Windows-base-image") | .outputs.out.path')/src" local windowsBaseImagePath="$(nix show-derivation -r -f $STATUSREACTPATH | jq -r '.[] | select(.env.name=="StatusIm-Windows-base-image") | .outputs.out.path')/src/"
local top_srcdir=$(joinExistingPath "$STATUSREACTPATH" '.') local top_srcdir=$(joinExistingPath "$STATUSREACTPATH" '.')
VERSION_MAJOR="$(cut -d'.' -f1 <<<"$VERSION")" VERSION_MAJOR="$(cut -d'.' -f1 <<<"$VERSION")"