diff options
| author | Domen Kožar <domen@dev.si> | 2022-10-10 11:07:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-10 11:07:41 +0200 |
| commit | ef56fd8979b5f4e800c4716f62076e00600b1172 (patch) | |
| tree | 52f5d4c5ab6a28fb68ad93cd36bd705698da026d /modules | |
| parent | 02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf (diff) | |
| parent | d0121790d4aac7a7b4b6bace63c26ef53e8c7e13 (diff) | |
Merge pull request #540 from thefloweringash/mandatory-features
nix: fix mandatoryFeatures in nix.buildMachines
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/nix/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 528c304..8a5bb18 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -683,8 +683,10 @@ in (if machine.sshKey != null then machine.sshKey else "-") (toString machine.maxJobs) (toString machine.speedFactor) - (concatStringsSep "," (machine.supportedFeatures ++ machine.mandatoryFeatures)) - (concatStringsSep "," machine.mandatoryFeatures) + (let res = (machine.supportedFeatures ++ machine.mandatoryFeatures); + in if (res == []) then "-" else (concatStringsSep "," res)) + (let res = machine.mandatoryFeatures; + in if (res == []) then "-" else (concatStringsSep "," machine.mandatoryFeatures)) ] ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-"))) + "\n" |