Merge pull request #4927 from mstarzyk/androidndk

android-ndk: updated to version r10c

3 files changed, 15 insertions, 13 deletions

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 114482655751..e24d6cefc3fa 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -1,26 +1,28 @@
-{ stdenv, fetchurl, zlib, ncurses
+{ stdenv, fetchurl, zlib, ncurses, p7zip
 }:
 
 stdenv.mkDerivation rec {
-  name = "android-ndk-r9d";
+  name = "android-ndk-r10c";
 
   src = if stdenv.system == "i686-linux"
     then fetchurl {
-      url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2";
-      sha256 = "0lrxx8rclmda72dynh0qjr6xpcnv5vs3gc96jcia37h8mmn2xv6m";
+      url = "http://dl.google.com/android/ndk/${name}-linux-x86.bin";
+      sha256 = "0gyq68zrpzj3gkh81czs6r0jmikg5rwzh1bqg4rk16g2nxm4lll3";
     }
     else if stdenv.system == "x86_64-linux" then fetchurl {
-      url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2";
-      sha256 = "16miwrnf3c7x7rlpmssmjx9kybmapsjyamjyivhabb2wm21x3q8l";
+      url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.bin";
+      sha256 = "126rqzkmf8xz1hqdziwx81yln17hpivs2j45rxhzdr45iw9b758c";
     }
-    else throw "platform not ${stdenv.system} supported!";
+    else throw "platform ${stdenv.system} not supported!";
 
   phases = "installPhase";
 
+  buildInputs = [ p7zip ];
+
   installPhase = ''
     set -x
     mkdir -pv $out
-    tar xf $src
+    7z x $src
     mv */* $out
 
     # so that it doesn't fail because of read-only permissions set
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 796f0f862bdd..74afa5072f98 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -129,7 +129,7 @@ rec {
   };
 
   androidndk = import ./androidndk.nix {
-    inherit (pkgs) stdenv fetchurl zlib ncurses;
+    inherit (pkgs) stdenv fetchurl zlib ncurses p7zip;
   };
   
   buildApp = import ./build-app.nix {
diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch
index afc3470aaba1..5eeadbbd12da 100644
--- a/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch
+++ b/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch
@@ -1,7 +1,7 @@
-diff -ru android-ndk-r9d.old/build/tools/make-standalone-toolchain.sh android-ndk-r9d/build/tools/make-standalone-toolchain.sh
---- android-ndk-r9d.old/build/tools/make-standalone-toolchain.sh	2014-09-25 11:42:09.990500975 +0200
-+++ android-ndk-r9d/build/tools/make-standalone-toolchain.sh	2014-09-25 11:43:06.097501636 +0200
-@@ -252,6 +252,9 @@
+diff -ru android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh android-ndk-r10c/build/tools/make-standalone-toolchain.sh
+--- android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh	2014-10-16 03:46:32.000000000 +0200
++++ android-ndk-r10c/build/tools/make-standalone-toolchain.sh	2014-10-24 23:46:22.544928306 +0200
+@@ -310,6 +310,9 @@
  # Now copy the GCC toolchain prebuilt binaries
  run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR"