b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #225929 from Artturin/fixadapters2

Browse source
This commit is contained in:
Artturi 2023-04-12 23:04:31 +03:00 committed by GitHub
parent e473a34365 67a84d1428
commit c88044fe0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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}"; };
}); });
}); });
} }