about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix')
-rw-r--r--nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix b/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix
index b3ca1c171b65..11ad37453f2a 100644
--- a/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix
@@ -1,4 +1,4 @@
-{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, stdenv, cmdLineToolsVersion, postInstall}:
+{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, stdenv, postInstall}:
 
 deployAndroidPackage {
   name = "androidsdk";
@@ -16,7 +16,7 @@ deployAndroidPackage {
     export ANDROID_SDK_ROOT="$out/libexec/android-sdk"
 
     # Wrap all scripts that require JAVA_HOME
-    find $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin -maxdepth 1 -type f -executable | while read program; do
+    find $ANDROID_SDK_ROOT/${package.path}/bin -maxdepth 1 -type f -executable | while read program; do
       if grep -q "JAVA_HOME" $program; then
         wrapProgram $program  --prefix PATH : ${pkgs.jdk11}/bin \
           --prefix ANDROID_SDK_ROOT : $ANDROID_SDK_ROOT
@@ -24,12 +24,12 @@ deployAndroidPackage {
     done
 
     # Wrap sdkmanager script
-    wrapProgram $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin/sdkmanager \
+    wrapProgram $ANDROID_SDK_ROOT/${package.path}/bin/sdkmanager \
       --prefix PATH : ${lib.makeBinPath [ pkgs.jdk11 ]} \
       --add-flags "--sdk_root=$ANDROID_SDK_ROOT"
 
     # Patch all script shebangs
-    patchShebangs $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin
+    patchShebangs $ANDROID_SDK_ROOT/${package.path}/bin
 
     cd $ANDROID_SDK_ROOT
     ${postInstall}