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

Ensure `STATUS_GO_SRC_OVERRIDE` gets passed to the Nix shell's `config` 

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
Pedro Pombeiro 2019-11-15 16:04:36 +01:00
parent 670c07b9b4
commit e38e9f1072
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nix/shell.sh
View File

@ -51,6 +51,10 @@ if [[ "$TARGET_OS" =~ (linux|windows|darwin|macos) ]]; then
nix-shell ${shellArgs[@]} --run "scripts/prepare-for-desktop-platform.sh" || exit nix-shell ${shellArgs[@]} --run "scripts/prepare-for-desktop-platform.sh" || exit
fi fi
if [ -n "${STATUS_GO_SRC_OVERRIDE}" ]; then
shellArgs+=("--arg config {android_sdk.accept_license=true;status_go.src_override=\"${STATUS_GO_SRC_OVERRIDE}\";}")
fi
# if _NIX_ATTR is specified we shouldn't use shell.nix, the path will be different # if _NIX_ATTR is specified we shouldn't use shell.nix, the path will be different
entryPoint="shell.nix" entryPoint="shell.nix"
if [ -n "${_NIX_ATTR}" ]; then if [ -n "${_NIX_ATTR}" ]; then

3
shell.nix
View File

@ -1,4 +1,5 @@
{ nixpkgs-bootstrap ? import ./nix/nixpkgs-bootstrap.nix { }, { config ? { android_sdk.accept_license = true; },
nixpkgs-bootstrap ? import ./nix/nixpkgs-bootstrap.nix { inherit config; },
pkgs ? nixpkgs-bootstrap.pkgs, pkgs ? nixpkgs-bootstrap.pkgs,
target-os ? "none" }: target-os ? "none" }: