From 152ec3e0a33816a433867a0c0ba8c6c9fc20f5a8 Mon Sep 17 00:00:00 2001
From: Daniel Weipert <code@drogueronin.de>
Date: Tue, 6 Jun 2023 21:05:32 +0200
Subject: fix nix androidsdk fixup for consistency between gitlab-ci and local

---
 shell.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index d457038..412b6ac 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,26 +1,19 @@
 with (import <nixpkgs> {});
 let
   jdk = jdk11;
-  android-composition = import ./nix/android-composition.nix;
+  androidsdk = import ./nix/androidsdk.nix;
 in
 mkShell rec {
   name = "android-shell";
 
 	buildInputs = [
-    python3Full
     gnumake
     jdk
-    android-composition.androidsdk
+    androidsdk
     bazel_4
 	];
 
   JAVA_HOME = jdk.home;
-  ANDROID_SDK_ROOT = "${android-composition.androidsdk}/libexec/android-sdk";
-  ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle";
+  ANDROID_SDK_ROOT = "${androidsdk}/libexec/android-sdk";
   ANDROID_HOME = "${ANDROID_SDK_ROOT}";
-
-  shellHook = ''
-    # TODO: replace with nix builtins
-    python ./nix/android-shell-shellHook.py ${ANDROID_HOME}/build-tools ${ANDROID_HOME}/platforms
-  '';
 }
-- 
cgit v1.2.3