diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-22 20:33:55 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-23 10:01:28 -0500 |
| commit | 9c213398b312e0f0bb9cdf05090fd20223a82ad0 (patch) | |
| tree | c645a940abedfc4abf51dbb99ce1a8e871e5e799 /nixos/modules/services/misc/nix-daemon.nix | |
| parent | 2bc16b381e09eeb75deefdf6fd5bdc4771b795f3 (diff) | |
| download | nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.gz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.bz2 nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.lz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.xz nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.zst nixpkgs-9c213398b312e0f0bb9cdf05090fd20223a82ad0.zip | |
lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that commit for details. This reverts commit 0bc275e63423456d6deb650e146120c39c1e0723.
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 0eeff31d6c4..64bdbf159d5 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -587,10 +587,10 @@ in nix.systemFeatures = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - 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} + optionals (pkgs.hostPlatform ? gcc.arch) ( + # a builder can run code for `gcc.arch` and inferior architectures + [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} ) ); |