diff options
Diffstat (limited to 'nixpkgs/nixos/lib/eval-config.nix')
| -rw-r--r-- | nixpkgs/nixos/lib/eval-config.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nixpkgs/nixos/lib/eval-config.nix b/nixpkgs/nixos/lib/eval-config.nix index 2daaa8a11863..791a03a3ba3c 100644 --- a/nixpkgs/nixos/lib/eval-config.nix +++ b/nixpkgs/nixos/lib/eval-config.nix @@ -9,7 +9,9 @@ # expressions are ever made modular at the top level) can just use # types.submodule instead of using eval-config.nix evalConfigArgs@ -{ # !!! system can be set modularly, would be nice to remove +{ # !!! system can be set modularly, would be nice to remove, + # however, removing or changing this default is too much + # of a breaking change. To set it modularly, pass `null`. system ? builtins.currentSystem , # !!! is this argument needed any more? The pkgs argument can # be set modularly anyway. @@ -48,12 +50,7 @@ let # this. Since the latter defaults to the former, the former should # default to the argument. That way this new default could propagate all # they way through, but has the last priority behind everything else. - nixpkgs.system = lib.mkDefault system; - - # Stash the value of the `system` argument. When using `nesting.children` - # we want to have the same default value behavior (immediately above) - # without any interference from the user's configuration. - nixpkgs.initialSystem = system; + nixpkgs.system = lib.mkIf (system != null) (lib.mkDefault system); _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); }; |