From 32071d5b4de36a41cc1d23f407f9911fccbc3031 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Sep 2010 08:15:45 +0000
Subject: [PATCH] Adding a list-in-list checker for builderDefs
 closePropagation

svn path=/nixpkgs/branches/stdenv-updates/; revision=23608
---
 pkgs/lib/misc.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix
index 91a37494744..7f04e7e1e58 100644
--- a/pkgs/lib/misc.nix
+++ b/pkgs/lib/misc.nix
@@ -215,11 +215,15 @@ rec {
 
 
   innerClosePropagation = ready: list: if list == [] then ready else
-    innerClosePropagation 
-      (ready ++ [(head list)])
-      ((tail list) 
-         ++ (maybeAttrNullable "propagatedBuildInputs" [] (head list))
-         ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] (head list)));
+    if ! isAttrs (head list) then
+      builtins.trace ("not an attrSet: ${lib.showVal (head list)}") 
+        innerClosePropagation ready (tail list)
+    else
+      innerClosePropagation 
+        (ready ++ [(head list)])
+        ((tail list) 
+           ++ (maybeAttrNullable "propagatedBuildInputs" [] (head list))
+           ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] (head list)));
 
   closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);});