diff options
Diffstat (limited to '')
-rw-r--r-- | default.nix | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/default.nix b/default.nix index 45e43c18e6d1..df69ee4c3e2e 100644 --- a/default.nix +++ b/default.nix @@ -9,29 +9,14 @@ let nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs; pkgs = import nixpkgs {system = builtins.currentSystem;}; - - configComponents = [ - configuration - (import ./system/options.nix) - ]; - - # Make a configuration object from which we can retrieve option - # values. - config = - pkgs.lib.fixOptionSets - pkgs.lib.mergeOptionSets - pkgs configComponents; - - optionDeclarations = - pkgs.lib.fixOptionSetsFun - pkgs.lib.filterOptionSets - pkgs configComponents - config; - + + inherit + (import ./lib/eval-config.nix {inherit configuration pkgs;}) + config optionDeclarations; + in { - # Optionally check wether all config values have corresponding # option declarations. system = pkgs.checker config.system.build.system |