Merge pull request #228755 from tennox/meteor-fix

This commit is contained in:
Artturi 2023-06-05 03:48:47 +03:00 committed by GitHub
commit 877e12b312
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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