Update SGT puzzles and improve builderDefs processing of propagated(Native)BuildInputs after stdenv merge

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

pkgs/build-support/builder-defs/builder-defs.nix

@@ -319,6 +319,10 @@ let inherit (builtins) head tail trace; in
 
         doDump = n: noDepEntry "echo Dump number ${n}; set";
 
+	doDumpBuildInputs = noDepEntry (''
+	  echo "${toString realBuildInputs}"
+	'');
+
         patchFlags = if args ? patchFlags then args.patchFlags else "-p1";
 
         patches = attrByPath ["patches"] [] args;

pkgs/games/sgt-puzzles/default.nix

@@ -2,16 +2,16 @@ a :
 let 
   fetchsvn = a.fetchsvn;
 
-  version = a.lib.attrByPath ["version"] "r8541" a; 
+  version = a.lib.attrByPath ["version"] "r8541" a;
   buildInputs = with a; [
-    gtk glib pkgconfig libX11 perl
+    gtk pkgconfig libX11 perl
   ];
 in
 rec {
   src = fetchsvn {
    url = svn://svn.tartarus.org/sgt/puzzles;
-   rev = "8842";
-   sha256 = "0rx3pxd1ci9x1mlw1jfmwd0fpcyv76vv6jraxfrxcykxx62qg479";
+   rev = "8872";
+   sha256 = "16hcrhkl6plzdhw60g7i4vgkxcc4mw4h4bzg2myy5cfhpx7y0m9s";
   } + "/";
 
   inherit buildInputs;
@@ -26,11 +26,7 @@ rec {
   '' ["minInit" "doUnpack" "addInputs"];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["addInputs" "doExport" "mkMakefiles" "doMakeInstall"];
-
-  doExport = a.noDepEntry ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11"
-  '';
+  phaseNames = ["addInputs" "mkMakefiles" "doMakeInstall"];
 
   name = "sgt-puzzles-" + version;
   meta = {

pkgs/lib/misc.nix

@@ -196,10 +196,11 @@ rec {
 
 
   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);
+    innerClosePropagation 
+      (ready ++ [(head list)])
+      ((tail list) 
+         ++ (maybeAttr "propagatedBuildInputs" [] (head list))
+	 ++ (maybeAttr "propagatedBuildNativeInputs" [] (head list)));
 
   closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);});
 

pkgs/top-level/all-packages.nix

@@ -8522,7 +8522,7 @@ let
   };
 
   sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) {
-    inherit (gtkLibs) gtk glib;
+    inherit (gtkLibs) gtk;
     inherit pkgconfig fetchsvn perl;
     inherit (xlibs) libX11;
   };