diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-23 18:01:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-23 18:01:49 +0000 |
| commit | 3cdd7718204d55c46ee81a58706e2ef1d291cbe7 (patch) | |
| tree | dbcce89d48dbf6ebcf08c550b3b3c1170e53c3a3 /pkgs/stdenv/adapters.nix | |
| parent | 1dd9fc27f56c8cdc6315f701148ca40b6bff8087 (diff) | |
| parent | 4688cd53b60d045633225e628d37f64105fb81ff (diff) | |
| download | nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.gz nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.bz2 nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.lz nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.xz nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.tar.zst nixpkgs-3cdd7718204d55c46ee81a58706e2ef1d291cbe7.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 2ea9a359f07..43fa87d14d8 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -142,7 +142,7 @@ rec { Example: stdenvNoOptimise = addAttrsToDerivation - { NIX_CFLAGS_COMPILE = "-O0"; } + { env.NIX_CFLAGS_COMPILE = "-O0"; } stdenv; */ addAttrsToDerivation = extraAttrs: stdenv: stdenv.override (old: { @@ -176,7 +176,7 @@ rec { stdenv.override (old: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { dontStrip = true; - NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; + env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; }); }); @@ -219,7 +219,7 @@ rec { impureUseNativeOptimizations = stdenv: stdenv.override (old: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { - NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; + env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; NIX_ENFORCE_NO_NATIVE = false; preferLocalBuild = true; @@ -244,7 +244,7 @@ rec { withCFlags = compilerFlags: stdenv: stdenv.override (old: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { - NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; + env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; }); }); } |