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

makeStaticDarwin: handle when env.NIX_CFLAGS_LINK is set

Browse Source
This commit is contained in:
Randy Eckenrode
2024-10-10 16:23:08 -04:00
parent 66fcbb94e7
commit 1c26a2fabc
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/adapters.nix
+10 -5
View File
@@ -138,11 +138,16 @@ rec {
# but more portable than Nix store binaries.
makeStaticDarwin = stdenv: stdenv.override (old: {
mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args:
(mkDerivationSuper args).overrideAttrs (prevAttrs: {
NIX_CFLAGS_LINK = toString (prevAttrs.NIX_CFLAGS_LINK or "")
+ lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc";
nativeBuildInputs = (prevAttrs.nativeBuildInputs or []);
}));
(mkDerivationSuper args).overrideAttrs (prevAttrs:
if prevAttrs ? env.NIX_CFLAGS_LINK then {
env = prevAttrs.env // {
NIX_CFLAGS_LINK = toString args.env.NIX_CFLAGS_LINK
+ lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc";
};
} else {
NIX_CFLAGS_LINK = toString (prevAttrs.NIX_CFLAGS_LINK or "")
+ lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc";
}));
});
# Puts all the other ones together