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

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:
Jakub Sokołowski 2020-05-20 13:35:56 +02:00
parent 0bec573eb3
commit 883af7b57a
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/gradlew vendored
View File

@ -17,8 +17,8 @@ if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
fi fi
# Map mavenLocal() to the Nix maven repo we set up in nix/mobile/android/maven-and-npm-deps/default.nix # 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 if [ -n "${STATUS_NIX_MAVEN_REPO}" ]; then
repoOpts="-Dmaven.repo.local=${STATUSREACT_NIX_MAVEN_REPO}" repoOpts="-Dmaven.repo.local=${STATUS_NIX_MAVEN_REPO}"
else else
repoOpts='' repoOpts=''
fi fi

2
nix/mobile/android/default.nix
View File

@ -34,7 +34,7 @@ in {
export ANDROID_SDK_ROOT="${androidPkgs}" export ANDROID_SDK_ROOT="${androidPkgs}"
export ANDROID_NDK_ROOT="${androidPkgs}/ndk-bundle" 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 # required by some makefile targets
export STATUS_GO_ANDROID_LIBDIR=${status-go} export STATUS_GO_ANDROID_LIBDIR=${status-go}

1
nix/shells.nix
View File

@ -77,6 +77,7 @@ let
inputsFrom = [ node-sh ]; inputsFrom = [ node-sh ];
shellHook = '' shellHook = ''
export STATUS_GO_ANDROID_LIBDIR="DUMMY" export STATUS_GO_ANDROID_LIBDIR="DUMMY"
export STATUS_NIX_MAVEN_REPO="${pkgs.deps.gradle}"
export ANDROID_SDK_ROOT="${pkgs.androidPkgs}" export ANDROID_SDK_ROOT="${pkgs.androidPkgs}"
export ANDROID_NDK_ROOT="${pkgs.androidPkgs}/ndk-bundle" export ANDROID_NDK_ROOT="${pkgs.androidPkgs}/ndk-bundle"
''; '';