public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4927 from mstarzyk/androidndk

Browse Source 
android-ndk: updated to version r10c
This commit is contained in:
Michael Raskin 2014-11-15 15:30:48 +03:00
commit 128b1af2e8
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/mobile/androidenv/androidndk.nix
View File

@ -1,26 +1,28 @@
{ stdenv, fetchurl, zlib, ncurses { stdenv, fetchurl, zlib, ncurses, p7zip
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "android-ndk-r9d"; name = "android-ndk-r10c";
src = if stdenv.system == "i686-linux" src = if stdenv.system == "i686-linux"
then fetchurl { then fetchurl {
url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2"; url = "http://dl.google.com/android/ndk/${name}-linux-x86.bin";
sha256 = "0lrxx8rclmda72dynh0qjr6xpcnv5vs3gc96jcia37h8mmn2xv6m"; sha256 = "0gyq68zrpzj3gkh81czs6r0jmikg5rwzh1bqg4rk16g2nxm4lll3";
} }
else if stdenv.system == "x86_64-linux" then fetchurl { else if stdenv.system == "x86_64-linux" then fetchurl {
url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2"; url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.bin";
sha256 = "16miwrnf3c7x7rlpmssmjx9kybmapsjyamjyivhabb2wm21x3q8l"; sha256 = "126rqzkmf8xz1hqdziwx81yln17hpivs2j45rxhzdr45iw9b758c";
} }
else throw "platform not ${stdenv.system} supported!"; else throw "platform ${stdenv.system} not supported!";
phases = "installPhase"; phases = "installPhase";
buildInputs = [ p7zip ];
installPhase = '' installPhase = ''
set -x set -x
mkdir -pv $out mkdir -pv $out
tar xf $src 7z x $src
mv */* $out mv */* $out
# so that it doesn't fail because of read-only permissions set # so that it doesn't fail because of read-only permissions set

2
pkgs/development/mobile/androidenv/default.nix
View File

@ -129,7 +129,7 @@ rec {
}; };
androidndk = import ./androidndk.nix { androidndk = import ./androidndk.nix {
inherit (pkgs) stdenv fetchurl zlib ncurses; inherit (pkgs) stdenv fetchurl zlib ncurses p7zip;
}; };
buildApp = import ./build-app.nix { buildApp = import ./build-app.nix {

8
pkgs/development/mobile/androidenv/make-standalone-toolchain.patch
View File

@ -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 diff -ru android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh android-ndk-r10c/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-r10c.old/build/tools/make-standalone-toolchain.sh 2014-10-16 03:46:32.000000000 +0200
+++ android-ndk-r9d/build/tools/make-standalone-toolchain.sh 2014-09-25 11:43:06.097501636 +0200 +++ android-ndk-r10c/build/tools/make-standalone-toolchain.sh 2014-10-24 23:46:22.544928306 +0200
@@ -252,6 +252,9 @@ @@ -310,6 +310,9 @@
# Now copy the GCC toolchain prebuilt binaries # Now copy the GCC toolchain prebuilt binaries
run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR" run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR"