tjh.dev
+3
-3
pkgs/stdenv/adapters.nix
+3
-3
pkgs/stdenv/adapters.nix
···
176
176
stdenv.override (old: {
177
177
mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
178
178
dontStrip = true;
179
-
env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; };
179
+
env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og"; };
180
180
});
181
181
});
182
182
···
219
219
impureUseNativeOptimizations = stdenv:
220
220
stdenv.override (old: {
221
221
mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
222
-
env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; };
222
+
env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " -march=native"; };
223
223
224
224
NIX_ENFORCE_NO_NATIVE = false;
225
225
···
245
245
withCFlags = compilerFlags: stdenv:
246
246
stdenv.override (old: {
247
247
mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
248
-
env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; };
248
+
env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; };
249
249
});
250
250
});
251
251
}