From 12401536fcfc24ee6d82f68af5a5035a711badcc Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sat, 5 Dec 2009 19:22:02 +0000 Subject: [PATCH] Replace the check function with a function specialized for modules. svn path=/nixos/trunk/; revision=18821 --- lib/eval-config.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/eval-config.nix b/lib/eval-config.nix index a0d34b4701fb..28db11e45c56 100644 --- a/lib/eval-config.nix +++ b/lib/eval-config.nix @@ -61,7 +61,8 @@ rec { # Optionally check wether all config values have corresponding # option declarations. - config = pkgs.checker optionDefinitions - optionDefinitions.environment.checkConfigurationOptions - options optionDefinitions; + config = + let doCheck = optionDefinitions.environment.checkConfigurationOptions; in + assert doCheck -> pkgs.lib.checkModule "" systemModule; + systemModule.config; }