Quoted NIX_CC
This commit is contained in:
parent
9f4c3b2efd
commit
8181b075ba
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
# Patch binaries
|
# Patch binaries
|
||||||
binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas)
|
binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas)
|
||||||
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \
|
||||||
--set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
|
--set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \
|
||||||
$out/share/nylas-mail/nylas
|
$out/share/nylas-mail/nylas
|
||||||
|
|
||||||
@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \
|
wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \
|
||||||
--set PATH "${coreutils}/bin"
|
--set PATH "${coreutils}/bin"
|
||||||
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \
|
||||||
--set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node
|
--set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user