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/applications/editors/eclipse | |
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/applications/editors/eclipse')
-rw-r--r-- | pkgs/applications/editors/eclipse/build-eclipse.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index e6828e6adad2..609c5e3c651f 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) libCairo=$out/eclipse/libcairo-swt.so patchelf --set-interpreter $interpreter $out/eclipse/eclipse - [ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo + [ -f $libCairo ] && patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo # Create wrapper script. Pass -configuration to store # settings in ~/.eclipse/org.eclipse.platform_<version> rather @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk.out}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. |