diff options
| author | Artturin <Artturin@artturin.com> | 2023-04-11 21:25:52 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-04-11 21:25:52 +0300 |
| commit | 9adf83737fe850f99c1b1a50cfe477248926c504 (patch) | |
| tree | 50179a408616f8a0600607f3fcc57b914aa07beb /pkgs/stdenv/adapters.nix | |
| parent | 49f40c090c6c51071fe066bba3ad465256ee920b (diff) | |
| download | nixlib-9adf83737fe850f99c1b1a50cfe477248926c504.tar nixlib-9adf83737fe850f99c1b1a50cfe477248926c504.tar.gz nixlib-9adf83737fe850f99c1b1a50cfe477248926c504.tar.bz2 nixlib-9adf83737fe850f99c1b1a50cfe477248926c504.tar.lz nixlib-9adf83737fe850f99c1b1a50cfe477248926c504.tar.xz nixlib-9adf83737fe850f99c1b1a50cfe477248926c504.tar.zst nixlib-9adf83737fe850f99c1b1a50cfe477248926c504.zip | |
stdenvAdapters: fix preservation of env
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 43fa87d14d88..eaf497f335f5 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -176,7 +176,7 @@ rec { stdenv.override (old: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { dontStrip = true; - env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; + env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; }; }); }); @@ -219,7 +219,8 @@ rec { impureUseNativeOptimizations = stdenv: stdenv.override (old: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { - env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; + env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; }; + NIX_ENFORCE_NO_NATIVE = false; preferLocalBuild = true; @@ -244,7 +245,7 @@ rec { withCFlags = compilerFlags: stdenv: stdenv.override (old: { mkDerivationFromStdenv = extendMkDerivationArgs old (args: { - env.NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; + env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; }; }); }); } |