JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meteor: Use makeLibraryPath

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-06-07 21:18:29 +03:00
parent f2e6c25dc9
commit 1829c84009
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/meteor/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
popd popd
substituteInPlace $out/tools/cli/main.js \ substituteInPlace $out/tools/cli/main.js \
--replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--replace "@RPATH@" "${stdenv.cc.cc.lib}/lib:${zlib.out}/lib" \ --replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \
--replace "@PATCHELF@" "${patchelf}/bin/patchelf" --replace "@PATCHELF@" "${patchelf}/bin/patchelf"
# Patch node. # Patch node.
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
for p in $devBundle/mongodb/bin/mongo{,d}; do for p in $devBundle/mongodb/bin/mongo{,d}; do
patchelf \ patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib:${zlib.out}/lib" \ --set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \
$p $p
done done