Skip to content

stdenv: fix withCFlags when NIX_CFLAGS_COMPILE exists outside of env #438709

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

Open
SuperSandro2000 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

stdenv: fix withCFlags when NIX_CFLAGS_COMPILE exists outside of env #438709

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
18 changes: 13 additions & 5 deletions pkgs/stdenv/adapters.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,11 +417,19 @@ 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 (
Copy link
Contributor

@philiptaron philiptaron Sep 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was introduced in #135533 and last modified in #225929.

args:
if lib.hasAttr "env" args then
{
env = (args.env or { }) // {
NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}";
};
}
else
{
NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}";
}
);
});

withDefaultHardeningFlags =
Expand Down
Loading