Skip to content

Commit 883af7b

Browse files
committed
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>
1 parent 0bec573 commit 883af7b

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

android/gradlew

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
1717
fi
1818

1919
# Map mavenLocal() to the Nix maven repo we set up in nix/mobile/android/maven-and-npm-deps/default.nix
20-
if [ -n "$STATUSREACT_NIX_MAVEN_REPO" ]; then
21-
repoOpts="-Dmaven.repo.local=${STATUSREACT_NIX_MAVEN_REPO}"
20+
if [ -n "${STATUS_NIX_MAVEN_REPO}" ]; then
21+
repoOpts="-Dmaven.repo.local=${STATUS_NIX_MAVEN_REPO}"
2222
else
2323
repoOpts=''
2424
fi

nix/mobile/android/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ in {
3434
export ANDROID_SDK_ROOT="${androidPkgs}"
3535
export ANDROID_NDK_ROOT="${androidPkgs}/ndk-bundle"
3636
37-
export STATUSREACT_NIX_MAVEN_REPO="${deps.gradle}"
37+
export STATUS_NIX_MAVEN_REPO="${deps.gradle}"
3838
3939
# required by some makefile targets
4040
export STATUS_GO_ANDROID_LIBDIR=${status-go}

nix/shells.nix

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ let
7777
inputsFrom = [ node-sh ];
7878
shellHook = ''
7979
export STATUS_GO_ANDROID_LIBDIR="DUMMY"
80+
export STATUS_NIX_MAVEN_REPO="${pkgs.deps.gradle}"
8081
export ANDROID_SDK_ROOT="${pkgs.androidPkgs}"
8182
export ANDROID_NDK_ROOT="${pkgs.androidPkgs}/ndk-bundle"
8283
'';

0 commit comments

Comments
 (0)