Merge pull request #178958 from hercules-ci/fix-installer-tests
nixos/nixpkgs.nix: Ignore the default system in check
This commit is contained in:
commit
1d43ea01da
|
@ -69,9 +69,9 @@ let
|
||||||
}'';
|
}'';
|
||||||
|
|
||||||
legacyOptionsDefined =
|
legacyOptionsDefined =
|
||||||
optional opt.system.isDefined opt.system
|
optional (opt.localSystem.highestPrio < (mkDefault {}).priority) opt.system
|
||||||
++ (optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem)
|
++ optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem
|
||||||
++ (optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem)
|
++ optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem
|
||||||
;
|
;
|
||||||
|
|
||||||
defaultPkgs =
|
defaultPkgs =
|
||||||
|
|
Loading…
Reference in a new issue