diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index cbcff8178e32..2b3bb3339481 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { mkdir -pv $out tar xf $src mv */* $out + + # so that it doesn't fail because of read-only permissions set + patch -p1 -d $out < ${ ./make-standalone-toolchain.patch } + find $out \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm +0100 \) \ diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch new file mode 100644 index 000000000000..afc3470aaba1 --- /dev/null +++ b/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch @@ -0,0 +1,13 @@ +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 @@ + # Now copy the GCC toolchain prebuilt binaries + run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR" + ++# Making it writable again ++chmod -R +w "$TMPDIR" ++ + # Replace soft-link mcld by real file + ALL_LDS=`find $TMPDIR -name "*mcld"` + for LD in $ALL_LDS; do