diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:43:29 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:58 +0100 |
| commit | 3115addf4c47fe6ca572188ec271ca567d505507 (patch) | |
| tree | 618945c04d7510470bb64b049275335a45980fb1 /nixos/lib | |
| parent | c9dad37f01d138e74d0e72050db6eb6f7d074948 (diff) | |
| download | nixlib-3115addf4c47fe6ca572188ec271ca567d505507.tar nixlib-3115addf4c47fe6ca572188ec271ca567d505507.tar.gz nixlib-3115addf4c47fe6ca572188ec271ca567d505507.tar.bz2 nixlib-3115addf4c47fe6ca572188ec271ca567d505507.tar.lz nixlib-3115addf4c47fe6ca572188ec271ca567d505507.tar.xz nixlib-3115addf4c47fe6ca572188ec271ca567d505507.tar.zst nixlib-3115addf4c47fe6ca572188ec271ca567d505507.zip | |
Fix nixos-option
In particular, it no longer produces an "infinite recursion" error when run with no arguments.
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/eval-config.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 5d487b91afb2..ece78691a848 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -16,14 +16,11 @@ rec { # Merge the option definitions in all modules, forming the full # system configuration. - systemModule = - pkgs.lib.evalModules { - modules = modules ++ baseModules; - args = extraArgs; - inherit check; - }; - - config = systemModule.config; + inherit (pkgs.lib.evalModules { + modules = modules ++ baseModules; + args = extraArgs; + inherit check; + }) config options; # These are the extra arguments passed to every module. In # particular, Nixpkgs is passed through the "pkgs" argument. |