From 8b47086b85cb62a25b6cf167e085c86418a0e399 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Nov 2009 12:15:39 +0000
Subject: * Change the check function to accept sub-modules with arguments in  
 option definitions.

svn path=/nixpkgs/trunk/; revision=18252
---
 pkgs/lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/lib')

diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index c806e922e357..d71cb9df097c 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -135,7 +135,7 @@ rec {
       name = "option set";
       # merge is done in "options.nix > addOptionMakeUp > handleOptionSets"
       merge = lib.id;
-      check = x: lib.traceValIfNot builtins.isAttrs x;
+      check = x: isAttrs x || builtins.isFunction x;
       hasOptions = true;
       delayOnGlobalEval = true;
     };
-- 
cgit 1.4.1