diff options
| author | volth <volth@volth.com> | 2020-08-05 02:32:41 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:28:22 +0000 |
| commit | bc030c028322c3797c351832ff2e41348351a223 (patch) | |
| tree | 1338ec7ecc4c5d9941b419b1b83fe164e261f1b9 /nixpkgs/nixos | |
| parent | 56a4b2b477a63be9bb1fd016dc9ccfc2bbebf600 (diff) | |
| download | nixlib-bc030c028322c3797c351832ff2e41348351a223.tar nixlib-bc030c028322c3797c351832ff2e41348351a223.tar.gz nixlib-bc030c028322c3797c351832ff2e41348351a223.tar.bz2 nixlib-bc030c028322c3797c351832ff2e41348351a223.tar.lz nixlib-bc030c028322c3797c351832ff2e41348351a223.tar.xz nixlib-bc030c028322c3797c351832ff2e41348351a223.tar.zst nixlib-bc030c028322c3797c351832ff2e41348351a223.zip | |
gcc.arch: refactor, move tables under lib/
(cherry picked from commit cf7b63df5b9efdef4e8e1b3261d7040199f7e671)
Diffstat (limited to 'nixpkgs/nixos')
| -rw-r--r-- | nixpkgs/nixos/modules/services/misc/nix-daemon.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index 0b3d7f3f03c3..5727e8e95730 100644 --- a/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -527,15 +527,8 @@ 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 [] + # a x86_64 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} ) ); |