diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-22 16:09:14 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-22 16:32:05 -0400 |
| commit | e5d262e1cc61d2ac3c77907e71a2449b4fec4698 (patch) | |
| tree | 7ad3e1ade93f69511b3f27c9089800e612cbc025 /pkgs/development/mobile | |
| parent | fc048073e6b25a81282a972778fe2c430b604908 (diff) | |
| download | nixlib-e5d262e1cc61d2ac3c77907e71a2449b4fec4698.tar nixlib-e5d262e1cc61d2ac3c77907e71a2449b4fec4698.tar.gz nixlib-e5d262e1cc61d2ac3c77907e71a2449b4fec4698.tar.bz2 nixlib-e5d262e1cc61d2ac3c77907e71a2449b4fec4698.tar.lz nixlib-e5d262e1cc61d2ac3c77907e71a2449b4fec4698.tar.xz nixlib-e5d262e1cc61d2ac3c77907e71a2449b4fec4698.tar.zst nixlib-e5d262e1cc61d2ac3c77907e71a2449b4fec4698.zip | |
androidndk: fixup
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/androidenv/androidndk.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 6a647192e091..7550830a4efd 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -32,9 +32,6 @@ stdenv.mkDerivation rec { ]) + ":${platformTools}/platform-tools"; in '' mkdir -pv $out/libexec - mkdir -pv $out/lib64 - ln -s ${ncurses5.out}/lib/libncursesw.so.5 $out/lib64/libtinfo.so.5 - ln -s ${ncurses5.out}/lib/libncurses.so.5 $out/lib64/libncurses.so.5 cd $out/libexec 7z x $src @@ -58,11 +55,11 @@ stdenv.mkDerivation rec { } cd ${pkg_path} - find $out \( \ + find ${pkg_path}/toolchains \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath $out/lib64:${stdenv.lib.makeLibraryPath [ libcxx.out zlib.out ncurses5 ]} {} \; + --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \; # fix ineffective PROGDIR / MYNDKDIR determination for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"} do diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 3b5da19da9e1..4aeaaf039279 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch } cd ${pkg_path} - find $out \( \ + find ${pkg_path}/toolchains \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ |