From c3d328ca484a8fe918358e5c575d490ca7aae6ad Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 6 Oct 2009 09:21:17 +0000
Subject: [PATCH] Fix sub-module argument manipulation: Avoid using an empty
 set to check the type of the module.

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

diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index 1b278e65f3d..0df5c63da55 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -192,16 +192,13 @@ rec {
                 # locations to sub-options declarations
                 decls =
                   map (m:
-                    mapSubOptions (subModule:
-                      let module = lib.applyIfFunction subModule {}; in
+                    mapSubOptions (subModule: (args:
+                      let module = lib.applyIfFunction subModule args; in
                       if lib.isModule module then
-                        { inherit (m) key; } // subModule
+                        { inherit (m) key; } // module
                       else
-                        args: {
-                          inherit (m) key;
-                          options = lib.applyIfFunction subModule args;
-                        }
-                    ) m.options
+                        { inherit (m) key; options = module; }
+                    )) m.options
                   ) (declarationsOf name);
               in
                 addOptionMakeUp