summary refs log tree commit diff
path: root/nixos/lib/eval-config.nix
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-05-05 16:23:57 -0400
committerNicolas B. Pierron <nicolas.b.pierron@gmail.com>2015-03-12 23:42:57 +0100
commite3eff53037f1b7abb7a44ba72f59f20649023642 (patch)
tree4e48d6f16aca424ee144a05390c481aa824ee070 /nixos/lib/eval-config.nix
parente4a06f35b1d88ab98fa8b6962e7a3f802232d165 (diff)
downloadnixpkgs-e3eff53037f1b7abb7a44ba72f59f20649023642.tar
nixpkgs-e3eff53037f1b7abb7a44ba72f59f20649023642.tar.gz
nixpkgs-e3eff53037f1b7abb7a44ba72f59f20649023642.tar.bz2
nixpkgs-e3eff53037f1b7abb7a44ba72f59f20649023642.tar.lz
nixpkgs-e3eff53037f1b7abb7a44ba72f59f20649023642.tar.xz
nixpkgs-e3eff53037f1b7abb7a44ba72f59f20649023642.tar.zst
nixpkgs-e3eff53037f1b7abb7a44ba72f59f20649023642.zip
evalModules: Add internal option for the check argument
Diffstat (limited to 'nixos/lib/eval-config.nix')
-rw-r--r--nixos/lib/eval-config.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 460f5601ae7..4ee1c61f54f 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -31,10 +31,9 @@ in rec {
   # Merge the option definitions in all modules, forming the full
   # system configuration.
   inherit (lib.evalModules {
-    inherit prefix;
+    inherit prefix check;
     modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
     args = extraArgs;
-    check = check && options.environment.checkConfigurationOptions.value;
   }) config options;
 
   # These are the extra arguments passed to every module.  In