1 files changed, 48 insertions, 51 deletions
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 85e604bd3f44..b362dc2dca5c 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,56 +1,53 @@
-{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}:
-
-stdenv.mkDerivation rec {
-  version = "26.0.2";
-  name = "android-build-tools-r${version}";
-  src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
-    then fetchurl {
-      url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip";
-      sha256 = "1kii880bwhjkc343zwx1ysxyisxhczrwhphnxbwsgi45mjgq8lm7";
-    }
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl {
-      url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip";
-      sha256 = "1x0ycprl6hgsm23kck5ind7x00hzydc5k3h3ch4a13407xbpvzvx";
-    }
-    else throw "System ${stdenv.hostPlatform.system} not supported!";
-
-  buildCommand = ''
-    mkdir -p $out/build-tools
-    cd $out/build-tools
-    unzip $src
-    mv android-* ${version}
-
-    ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
-      ''
-        cd ${version}
-
-        ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5
-
-        find . -type f -print0 | while IFS= read -r -d "" file
-        do
-          type=$(file "$file")
-          ## Patch 64-bit binaries
-          if grep -q "ELF 64-bit" <<< "$type"
-          then
-            if grep -q "interpreter" <<< "$type"
+{stdenv, lib, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses, coreutils, buildToolsSources}:
+
+let buildBuildTools = name: { version, src }:
+  stdenv.mkDerivation rec {
+    inherit version src;
+    name = "android-build-tools-r${version}";
+    buildCommand = ''
+      mkdir -p $out/build-tools
+      cd $out/build-tools
+      unzip $src
+      mv android-* ${version}
+
+      cd ${version}
+
+      for f in $(grep -Rl /bin/ls .); do
+        sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f"
+      done
+
+      ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
+        ''
+
+          ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5
+
+          find . -type f -print0 | while IFS= read -r -d "" file
+          do
+            type=$(file "$file")
+            ## Patch 64-bit binaries
+            if grep -q "ELF 64-bit" <<< "$type"
             then
-              patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 "$file"
-            fi
-            patchelf --set-rpath `pwd`/lib64:${stdenv.cc.cc.lib.out}/lib:${zlib.out}/lib:${ncurses.out}/lib "$file"
-          ## Patch 32-bit binaries
-          elif grep -q "ELF 32-bit" <<< "$type"
-          then
-            if grep -q "interpreter" <<< "$type"
+              if grep -q "interpreter" <<< "$type"
+              then
+                patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 "$file"
+              fi
+              patchelf --set-rpath `pwd`/lib64:${stdenv.cc.cc.lib.out}/lib:${zlib.out}/lib:${ncurses.out}/lib "$file"
+            ## Patch 32-bit binaries
+            elif grep -q "ELF 32-bit" <<< "$type"
             then
-              patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file"
+              if grep -q "interpreter" <<< "$type"
+              then
+                patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file"
+              fi
+              patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file"
             fi
-            patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file"
-          fi
-        done
-      ''}
+          done
+        ''}
 
-      patchShebangs .
-  '';
+        patchShebangs .
+    '';
 
-  buildInputs = [ unzip file ];
-}
+    buildInputs = [ unzip file ];
+  };
+in
+  lib.mapAttrs buildBuildTools buildToolsSources