diff options
| author | Janne Heß <janne@hess.ooo> | 2022-02-12 22:20:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-12 22:20:22 +0100 |
| commit | 828aab5608a38eb71112deb91d46d34857ca5740 (patch) | |
| tree | d9edfac3601201cd533ea79415a7135f37255458 /nixos | |
| parent | ba1a6cb96221ea2ca58ae10cdc8d1165bb49c722 (diff) | |
| parent | 0bac44db62148b531fd2cc73c47312aff0ab78b4 (diff) | |
Merge pull request #159014 from jian-lin/fix-nix.buildMachines.mandatoryFeatures
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index ea57292fc4bf3..a401458c41697 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -680,7 +680,7 @@ in (if machine.sshKey != null then machine.sshKey else "-") (toString machine.maxJobs) (toString machine.speedFactor) - (concatStringsSep "," machine.supportedFeatures) + (concatStringsSep "," (machine.supportedFeatures ++ machine.mandatoryFeatures)) (concatStringsSep "," machine.mandatoryFeatures) ] ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-"))) |