summary refs log tree commit diff
path: root/pkgs/development/mobile/androidenv/platform-tools.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/mobile/androidenv/platform-tools.nix')
-rw-r--r--pkgs/development/mobile/androidenv/platform-tools.nix21
1 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index a7a2661bd37..ab64ad589db 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -1,18 +1,23 @@
 {stdenv, stdenv_32bit, fetchurl, unzip}:
 
+let
+  version = "21";
+
+in
+
 stdenv.mkDerivation {
-  name = "android-platform-tools-r19";
+  name = "android-platform-tools-r${version}";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
-      url = https://dl-ssl.google.com/android/repository/platform-tools_r19-linux.zip;
-      sha1 = "66ee37daf8a2a8f1aa8939ccd4093658e30aa49b";
+      url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-linux.zip";
+      sha256 = "35a1762b355451e000a816d97d9af640ca99ae6c5b5b406a3e680210af8106ad";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = https://dl-ssl.google.com/android/repository/platform-tools_r19-macosx.zip;
-      sha1 = "69af30f488163dfc3da8cef1bb6cc7e8a6df5681";
+      url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-macosx.zip";
+      sha256 = "30ae8724da3db772a776d616b4746516f24ae81330e84315a7ce0c49e0b0b3cb";
     }
     else throw "System ${stdenv.system} not supported!";
-  
+
   buildCommand = ''
     mkdir -p $out
     cd $out
@@ -23,8 +28,8 @@ stdenv.mkDerivation {
       ''
         for i in adb fastboot
         do
-            patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
-            patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i
+            patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
+            patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i
         done
     ''}
   '';