diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-06-07 21:18:29 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-06-07 21:18:29 +0300 |
| commit | 1829c84009dd785046f2973f3618b5a6f07dfc0a (patch) | |
| tree | fd58499831ff9119754ef5b4d040132b1ee31d48 /pkgs/servers/meteor | |
| parent | f2e6c25dc9c40732425668c8008df3b277df0f33 (diff) | |
meteor: Use makeLibraryPath
Diffstat (limited to 'pkgs/servers/meteor')
| -rw-r--r-- | pkgs/servers/meteor/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 370a430ec1a6e..82a5604bed848 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { popd substituteInPlace $out/tools/cli/main.js \ --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" # Patch node. @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { for p in $devBundle/mongodb/bin/mongo{,d}; do patchelf \ --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 done |