nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

stdenvAdapters: fix preservation of env.NIX_CFLAGS_COMPILE

Browse Source 
we have managed to migrate to NIX_CFLAGS_COMPILE to the env attrset well
enough that we don't need to support having it toplevel. mkDerivation
will throw if there's a attr in both env and toplevel so no need to
worry about that
This commit is contained in:
Artturin 2023-04-12 21:27:34 +03:00
parent 9adf83737f
commit 67a84d1428
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/stdenv/adapters.nix
View File

@ -176,7 +176,7 @@ rec {
stdenv.override (old: { stdenv.override (old: {
mkDerivationFromStdenv = extendMkDerivationArgs old (args: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
dontStrip = true; dontStrip = true;
env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; }; env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; };
}); });
}); });
@ -219,7 +219,7 @@ rec {
impureUseNativeOptimizations = stdenv: impureUseNativeOptimizations = stdenv:
stdenv.override (old: { stdenv.override (old: {
mkDerivationFromStdenv = extendMkDerivationArgs old (args: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; }; env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " -march=native"; };
NIX_ENFORCE_NO_NATIVE = false; NIX_ENFORCE_NO_NATIVE = false;
@ -245,7 +245,7 @@ rec {
withCFlags = compilerFlags: stdenv: withCFlags = compilerFlags: stdenv:
stdenv.override (old: { stdenv.override (old: {
mkDerivationFromStdenv = extendMkDerivationArgs old (args: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; }; env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; };
}); });
}); });
} }