From 8b52e84e1af89ebd9843a75a8302f6ab3b70e4d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 May 2009 16:00:30 +0000
Subject: [PATCH] * Fix a comparison of function values (disallowed in the Nix
 trunk).   Thanks to Nicolas.

svn path=/nixpkgs/trunk/; revision=15734
---
 pkgs/lib/options.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index 2e867cf44d7..f42eced37d7 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -194,16 +194,16 @@ rec {
         in cfg3;
 
       getRequire = x: toList (attrByPath ["require"] [] (preprocess x));
-      getRecusiveRequire = x:
+      getRecursiveRequire = x:
         fold (cfg: l:
           if isPath cfg then
             [ cfg ] ++ l
           else
-            [ cfg ] ++ (getRecusiveRequire cfg) ++ l
+            [ cfg ] ++ (getRecursiveRequire cfg) ++ l
         ) [] (getRequire x);
 
-      getRequireSets = x: filter (x: ! isPath x) (getRecusiveRequire x);
-      getRequirePaths = x: filter isPath (getRecusiveRequire x);
+      getRequireSets = x: filter (x: ! isPath x) (getRecursiveRequire x);
+      getRequirePaths = x: filter isPath (getRecursiveRequire x);
       rmRequire = x: removeAttrs (preprocess x) ["require"];
 
       inlineRequiredSets = cfgs:
@@ -211,9 +211,7 @@ rec {
     in
       merge "" (
         map rmRequire (
-          inlineRequiredSets (
-            lib.uniqFlatten getRequirePaths [] [] (toList opts)
-          )
+          inlineRequiredSets ((toList opts) ++ lib.uniqFlatten getRequirePaths [] [] (lib.concatMap getRequirePaths (toList opts)))
         )
       );