diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 00:04:39 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 00:04:39 +0300 |
| commit | 51ad423716ec959aa6056660202e59a4b400ca4e (patch) | |
| tree | c29cb4491c03cd10deb14823d8d7cb8e29f8f69a /pkgs/development/mobile/androidenv | |
| parent | d559c07bbe1aa0be1662cdb5d697dcbac0f34b0a (diff) | |
| download | nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar.gz nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar.bz2 nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar.lz nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar.xz nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.tar.zst nixlib-51ad423716ec959aa6056660202e59a4b400ca4e.zip | |
treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls
Diffstat (limited to 'pkgs/development/mobile/androidenv')
| -rw-r--r-- | pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 1896a615ac1e..4239dc55e7c4 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath ${zlib.out}/lib:${ncurses.out}/lib {} \; + --set-rpath ${stdenv.lib.makeLibraryPath [ zlib ncurses ]} {} \; # fix ineffective PROGDIR / MYNDKDIR determination for i in ndk-build ndk-gdb ndk-gdb-py do |