mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

merge in ewemoa's zipalign fix with my updated build-tools

Browse source 
now passes Android tests found at https://github.com/svanderburg/nix-androidenvtests !
This commit is contained in:
Cray Elliott 2014-08-31 23:37:43 -07:00 committed by Sander van der Burg
parent 0ede64bfcb
commit 02f5f25b2d
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/mobile/androidenv/build-tools.nix
View file

@ -39,6 +39,13 @@ stdenv.mkDerivation {
do
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:`pwd` $i
done
# These binaries also need zlib in addition to libstdc++
for i in zipalign
do
patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
done
# These binaries need to find libstdc++, libgcc_s, and zlib
for i in aapt dexdump