treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls

2016-08-23 00:04:39 +03:00
parent d559c07bbe
commit 51ad423716
10 changed files with 11 additions and 11 deletions
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
    cp -r * $out/res

    patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
-             --set-rpath ${stdenv.cc.cc.lib}/lib:${libX11}/lib:${mesa}/lib \
+             --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 mesa ]} \
             "$out/res/Tibia"

    # We've patchelf'd the files. The main ‘Tibia’ binary is a bit