From b98b622ef0e9ff983ab5b99fe9c7f13d1fa04beb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 14 Sep 2009 20:10:41 +0000
Subject: Fix NixOS evaluation. As I understand, configuration gets added to
 the list of modules as an attrSet (not as a file name). Just add a trivial
 check to passthrough such modules.

svn path=/nixpkgs/trunk/; revision=17116
---
 pkgs/lib/modules.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pkgs/lib/modules.nix')

diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index b7c3062f6a8..7e1d2f9d56f 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -64,8 +64,10 @@ rec {
 
   moduleClosure = initModules: args:
     let
-      moduleImport = m: lib.addErrorContext "Import module ${m}." (
-        (unifyModuleSyntax (applyIfFunction (import m) args)) // {
+      moduleImport = m: lib.addErrorContext 
+        "Import module ${(if builtins.isAttrs m then "{...}" else m)}." (
+        (unifyModuleSyntax (applyIfFunction 
+	  (if builtins.isAttrs m then m else import m) args)) // {
           # used by generic closure to avoid duplicated imports.
           key = m;
           paths = [ m ];
@@ -88,4 +90,4 @@ rec {
         [ m ]
     ) modules;
 
-}
\ No newline at end of file
+}
-- 
cgit 1.4.1