nix: add missing Gradle repo path in gradle shell
Also rename STATUSREACT_NIX_MAVEN_REPO to STATUS_NIX_MAVEN_REPO. Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
0bec573eb3
commit
883af7b57a
|
@ -17,8 +17,8 @@ if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
|||
fi
|
||||
|
||||
# Map mavenLocal() to the Nix maven repo we set up in nix/mobile/android/maven-and-npm-deps/default.nix
|
||||
if [ -n "$STATUSREACT_NIX_MAVEN_REPO" ]; then
|
||||
repoOpts="-Dmaven.repo.local=${STATUSREACT_NIX_MAVEN_REPO}"
|
||||
if [ -n "${STATUS_NIX_MAVEN_REPO}" ]; then
|
||||
repoOpts="-Dmaven.repo.local=${STATUS_NIX_MAVEN_REPO}"
|
||||
else
|
||||
repoOpts=''
|
||||
fi
|
||||
|
|
|
@ -34,7 +34,7 @@ in {
|
|||
export ANDROID_SDK_ROOT="${androidPkgs}"
|
||||
export ANDROID_NDK_ROOT="${androidPkgs}/ndk-bundle"
|
||||
|
||||
export STATUSREACT_NIX_MAVEN_REPO="${deps.gradle}"
|
||||
export STATUS_NIX_MAVEN_REPO="${deps.gradle}"
|
||||
|
||||
# required by some makefile targets
|
||||
export STATUS_GO_ANDROID_LIBDIR=${status-go}
|
||||
|
|
|
@ -77,6 +77,7 @@ let
|
|||
inputsFrom = [ node-sh ];
|
||||
shellHook = ''
|
||||
export STATUS_GO_ANDROID_LIBDIR="DUMMY"
|
||||
export STATUS_NIX_MAVEN_REPO="${pkgs.deps.gradle}"
|
||||
export ANDROID_SDK_ROOT="${pkgs.androidPkgs}"
|
||||
export ANDROID_NDK_ROOT="${pkgs.androidPkgs}/ndk-bundle"
|
||||
'';
|
||||
|
|
Loading…
Reference in New Issue