From 5553486d3126729fa3b369c583a1a1b46f603bc8 Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Tue, 26 Mar 2019 11:03:06 +0100 Subject: [PATCH] Fix base image path import in Windows setup Signed-off-by: Pedro Pombeiro --- .gitignore | 1 + scripts/build-desktop.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7d8dee4e5d..d3a3efddb6 100644 --- a/.gitignore +++ b/.gitignore @@ -148,6 +148,7 @@ Status-Windows-x86_64.exe /desktop/lib/* /desktop/modules/* /desktop/Makefile +/desktop/graph_info.json /desktop/run-app.bat /desktop/run-app.sh /desktop/CMakeFiles/ diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh index 11b28e905c..ddf3b9517e 100755 --- a/scripts/build-desktop.sh +++ b/scripts/build-desktop.sh @@ -206,7 +206,7 @@ function bundleWindows() { fi # 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" '.') VERSION_MAJOR="$(cut -d'.' -f1 <<<"$VERSION")"