mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
Merge pull request #228755 from tennox/meteor-fix
This commit is contained in:
commit
877e12b312
1 changed files with 3 additions and 3 deletions
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }:
|
||||
{ stdenv, lib, fetchurl, zlib, curl, xz, patchelf, runtimeShell }:
|
||||
|
||||
let
|
||||
version = "2.7.3";
|
||||
|
@ -66,7 +66,7 @@ stdenv.mkDerivation {
|
|||
popd
|
||||
substituteInPlace $out/tools/cli/main.js \
|
||||
--replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \
|
||||
--replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib curl xz ]}" \
|
||||
--replace "@PATCHELF@" "${patchelf}/bin/patchelf"
|
||||
|
||||
# Patch node.
|
||||
|
@ -79,7 +79,7 @@ stdenv.mkDerivation {
|
|||
for p in $out/dev_bundle/mongodb/bin/mongo{,d}; do
|
||||
patchelf \
|
||||
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \
|
||||
--set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib curl xz ]}" \
|
||||
$p
|
||||
done
|
||||
|
||||
|
|
Loading…
Reference in a new issue