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/compilers/gcc-arm-embedded | |
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/compilers/gcc-arm-embedded')
-rw-r--r-- | pkgs/development/compilers/gcc-arm-embedded/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 65c0f2ea1c59..7908d6d06ef8 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { for f in $(find $out); do if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \ - --set-rpath $out/lib:${getLib gcc}/lib:${ncurses.out}/lib \ + --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" gcc ncurses ]} \ "$f" || true fi done |