diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2022-06-25 10:48:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-25 10:48:29 +0200 |
| commit | 1d43ea01dafcbce6ae97ccdfa0060bab02e70aff (patch) | |
| tree | 44ff53ee535c4dfd31d46972f24bf3e264afc0aa /nixos | |
| parent | cd875c3cb24a9fc8f67437528180a43d2b07c5dc (diff) | |
| parent | 985b6812d6ae6ae4772fd03cf303ad20d89e0138 (diff) | |
Merge pull request #178958 from hercules-ci/fix-installer-tests
nixos/nixpkgs.nix: Ignore the default system in check
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 132a9b68ceb49..ad017aff816c7 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -69,9 +69,9 @@ let }''; legacyOptionsDefined = - optional opt.system.isDefined opt.system - ++ (optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem) - ++ (optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem) + optional (opt.localSystem.highestPrio < (mkDefault {}).priority) opt.system + ++ optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem + ++ optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem ; defaultPkgs = |