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/ghc | |
| 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/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/6.10.2-binary.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/7.0.4-binary.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/7.4.2-binary.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 2df019bd7f16..5e5157215d35 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then '' find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libedit}/lib:${ncurses5.out}/lib:${gmp.out}/lib" {} \; + --set-rpath "${lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \; for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; done diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 9b9da4d4f78a..6140cde4a9ef 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${ncurses5.out}/lib:${gmp.out}/lib" {} \; + --set-rpath "${stdenv.lib.makeLibraryPath [ ncurses5 gmp ]}" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 5faae118d8cb..25eabc769aa5 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${gmp.out}/lib" {} \; + --set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do |