From 985b6812d6ae6ae4772fd03cf303ad20d89e0138 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 25 Jun 2022 10:40:41 +0200 Subject: nixos/nixpkgs.nix: Ignore the default system in check We might want to make this more strict at some point. --- nixos/modules/misc/nixpkgs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos') 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 = -- cgit 1.4.1