From 200eb189ea8ce62ea0a4927cb9c3c47674415811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Thu, 21 Oct 2021 23:35:43 +0200
Subject: [PATCH] nix: fix use of androidPkgs in gradle shell
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 nix/shells.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nix/shells.nix b/nix/shells.nix
index 86ad988175..387ad5a4b3 100644
--- a/nix/shells.nix
+++ b/nix/shells.nix
@@ -14,7 +14,6 @@ let
 
   # Combines with many other shells
   node-sh = mkShell {
-    buildInputs = [ pkgs.androidPkgs ];
     shellHook = ''
       export STATUS_REACT_HOME=$(git rev-parse --show-toplevel)
       $STATUS_REACT_HOME/nix/scripts/node_modules.sh ${pkgs.deps.nodejs-patched}
@@ -52,8 +51,8 @@ let
       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"
+        export ANDROID_SDK_ROOT="${pkgs.androidPkgs.sdk}"
+        export ANDROID_NDK_ROOT="${pkgs.androidPkgs.ndk}"
       '';
     };