Skip to content

stdenv: fix withCFlags #393458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
andresilva wants to merge 1 commit into from
Closed

stdenv: fix withCFlags #393458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions pkgs/stdenv/adapters.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,25 @@ rec {
withCFlags =
compilerFlags: stdenv:
stdenv.override (old: {
mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
env = (args.env or { }) // {
NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}";
};
});
mkDerivationFromStdenv = extendMkDerivationArgs old (
args:
let
diff =
if (args ? env && args.env ? NIX_CFLAGS_COMPILE && builtins.isList args.env.NIX_CFLAGS_COMPILE) then
{ env.NIX_CFLAGS_COMPILE = args.env.NIX_CFLAGS_COMPILE ++ compilerFlags; }
else if
(args ? env && args.env ? NIX_CFLAGS_COMPILE && builtins.isString args.env.NIX_CFLAGS_COMPILE)
then
{ env.NIX_CFLAGS_COMPILE = args.env.NIX_CFLAGS_COMPILE + " ${toString compilerFlags}"; }
else if (args ? NIX_CFLAGS_COMPILE && builtins.isList args.NIX_CFLAGS_COMPILE) then
{ NIX_CFLAGS_COMPILE = args.NIX_CFLAGS_COMPILE ++ compilerFlags; }
else if (args ? NIX_CFLAGS_COMPILE && builtins.isString args.NIX_CFLAGS_COMPILE) then
{ NIX_CFLAGS_COMPILE = args.NIX_CFLAGS_COMPILE + " ${toString compilerFlags}"; }
else
{ env.NIX_CFLAGS_COMPILE = toString compilerFlags; };
in
lib.recursiveUpdate args diff
);
});

# Overriding the SDK changes the Darwin SDK used to build the package, which:
Expand Down