From 883af7b57a131ff6aabec29061624aa61e6d31e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Wed, 20 May 2020 13:35:56 +0200
Subject: [PATCH] nix: add missing Gradle repo path in gradle shell
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also rename STATUSREACT_NIX_MAVEN_REPO to STATUS_NIX_MAVEN_REPO.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 android/gradlew                | 4 ++--
 nix/mobile/android/default.nix | 2 +-
 nix/shells.nix                 | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/gradlew b/android/gradlew
index 7047e372b2..7e5e936d81 100755
--- a/android/gradlew
+++ b/android/gradlew
@@ -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
diff --git a/nix/mobile/android/default.nix b/nix/mobile/android/default.nix
index fb910e46a8..5f017975c9 100644
--- a/nix/mobile/android/default.nix
+++ b/nix/mobile/android/default.nix
@@ -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}
diff --git a/nix/shells.nix b/nix/shells.nix
index dfa153d2b9..5060779174 100644
--- a/nix/shells.nix
+++ b/nix/shells.nix
@@ -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"
       '';