Added gdmap, changed builder-defs to use derivation attribute on propagatedBuildInputs, manually fixed Xorg expression problem for Compiz, various fixes.

svn path=/nixpkgs/trunk/; revision=9812

1 files changed, 8 insertions, 0 deletions

diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix
index e86ff3ef01fe..4d58270db230 100644
--- a/pkgs/lib/default.nix
+++ b/pkgs/lib/default.nix
@@ -251,4 +251,12 @@ rec {
   debugVal = if builtins ? trace then x: (builtins.trace x x) else x: x;
   debugXMLVal = if builtins ? trace then x: (builtins.trace (builtins.toXML x) x) else x: x;
 
+  innerClosePropagation = ready: list: if list == [] then ready else
+    if (head list) ? propagatedBuildInputs then 
+      innerClosePropagation (ready ++ [(head list)]) 
+        ((head list).propagatedBuildInputs ++ (tail list)) else
+      innerClosePropagation (ready ++ [(head list)]) (tail list);
+
+  closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);});
+
 }