summary refs log tree commit diff
path: root/nixos/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 22:43:29 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 22:45:58 +0100
commit3115addf4c47fe6ca572188ec271ca567d505507 (patch)
tree618945c04d7510470bb64b049275335a45980fb1 /nixos/default.nix
parentc9dad37f01d138e74d0e72050db6eb6f7d074948 (diff)
downloadnixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar.gz
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar.bz2
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar.lz
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar.xz
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.tar.zst
nixpkgs-3115addf4c47fe6ca572188ec271ca567d505507.zip
Fix nixos-option
In particular, it no longer produces an "infinite recursion" error
when run with no arguments.
Diffstat (limited to 'nixos/default.nix')
-rw-r--r--nixos/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/default.nix b/nixos/default.nix
index 88f82a82482..5d69b79e13a 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -9,7 +9,7 @@ let
     modules = [ configuration ];
   };
 
-  inherit (eval) config pkgs;
+  inherit (eval) pkgs;
 
   # This is for `nixos-rebuild build-vm'.
   vmConfig = (import ./lib/eval-config.nix {
@@ -30,9 +30,9 @@ let
 in
 
 {
-  inherit eval config;
+  inherit (eval) config options;
 
-  system = config.system.build.toplevel;
+  system = eval.config.system.build.toplevel;
 
   vm = vmConfig.system.build.vm;