diff options
| author | volth <volth@webmaster.ms> | 2019-04-21 19:16:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-21 19:16:28 +0000 |
| commit | b1c3581b467b3376dede1132b9d9b88a20ac7cf2 (patch) | |
| tree | 4c05d251fd4b55708a10fb47b7e09541b0993d33 /pkgs/stdenv/generic | |
| parent | 5d87bc2650221763d5378bd8cdbd6b84a11b2162 (diff) | |
make-derivation.nix: @matthewbauer's review
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index cd239638418d..cb50fdf7313e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -253,9 +253,8 @@ in rec { enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { NIX_HARDENING_ENABLE = enabledHardeningOptions; - } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.platform.gcc.arch or stdenv.hostPlatform.parsed.cpu.arch or "x86-64" != "x86-64") { - requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.platform.gcc.arch or stdenv.hostPlatform.parsed.cpu.arch}" ]; - NIX_ENFORCE_NO_NATIVE = true; + } // lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.platform ? gcc.arch) { + requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.platform.gcc.arch}" ]; } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { inherit __darwinAllowLocalNetworking; # TODO: remove lib.unique once nix has a list canonicalization primitive |