diff options
| author | volth <volth@volth.com> | 2019-04-21 16:13:37 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2019-04-21 16:37:49 +0000 |
| commit | 5d87bc2650221763d5378bd8cdbd6b84a11b2162 (patch) | |
| tree | e628146d0b33553e51bf62c6b27e993335131077 /pkgs/stdenv/generic | |
| parent | 7f3fed9cba627e7934384da6c1e8604afda31110 (diff) | |
fix bootstrap when platform.gcc.arch=="skylake"
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 417c10363b52..cd239638418d 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -253,6 +253,9 @@ 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.buildPlatform.isDarwin) { inherit __darwinAllowLocalNetworking; # TODO: remove lib.unique once nix has a list canonicalization primitive |