diff options
| author | John Ericson <git@JohnEricson.me> | 2020-09-01 22:31:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 22:31:16 -0400 |
| commit | 1965a241fc2476ff63e8b97019a3db58707a8325 (patch) | |
| tree | 7e5efc37712cd6e72c85ee08a5b2a6965c3b4f6a /nixos/modules/services/misc/nix-daemon.nix | |
| parent | 54eacc77f7e8fd20db467f1363fee937ca8f5fa1 (diff) | |
| parent | c5fe132b3c5da5044c01a9bd4aa4ab45795cb9e6 (diff) | |
| download | nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.gz nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.bz2 nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.lz nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.xz nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.tar.zst nixpkgs-1965a241fc2476ff63e8b97019a3db58707a8325.zip | |
Merge pull request #61019 from volth/gcc.arch-amd
platform.gcc.arch: support for AMD CPUs
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 0fbc9cecb4d..2680b1cc0d3 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -587,16 +587,10 @@ in nix.systemFeatures = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) ( - # a x86_64 builder can run code for `platform.gcc.arch` and minor architectures: - [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ { - sandybridge = [ "gccarch-westmere" ]; - ivybridge = [ "gccarch-westmere" "gccarch-sandybridge" ]; - haswell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ]; - broadwell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ]; - skylake = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ]; - skylake-avx512 = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ]; - }.${pkgs.hostPlatform.platform.gcc.arch} or [] + optionals (pkgs.hostPlatform.platform ? gcc.arch) ( + # a builder can run code for `platform.gcc.arch` and inferior architectures + [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch} ) ); |