* Use $propagatedBuildInputs to find build inputs.

* Bug fix in setup.sh.

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

7 files changed, 22 insertions, 35 deletions

diff --git a/pkgs/TODO b/pkgs/TODO
index 42bd96b25d41..e69de29bb2d1 100644
--- a/pkgs/TODO
+++ b/pkgs/TODO
@@ -1,6 +0,0 @@
-* Add $propagatedBuildInputs to $buildInputs in setup.sh.  Then clean
-  up freedesktop/libX11/default.nix, libSM.
-
-* In setup.sh: create $out prior to calling `make install'.
-
-* In setup.sh: `mkdir -f' -> `if ! test -x $out/...; then mkdir ...'.
diff --git a/pkgs/development/libraries/freedesktop/libSM/builder.sh b/pkgs/development/libraries/freedesktop/libSM/builder.sh
index 3f0cb5a15052..a73f5a6d5b8d 100755
--- a/pkgs/development/libraries/freedesktop/libSM/builder.sh
+++ b/pkgs/development/libraries/freedesktop/libSM/builder.sh
@@ -1,8 +1,3 @@
 #! /bin/sh -e
 . $stdenv/setup
 genericBuild
-
-if test -n "$_propagatedBuildInputs"; then
-    if ! test -x $out/nix-support; then mkdir $out/nix-support; fi
-    echo "$_propagatedBuildInputs" > $out/nix-support/propagated-build-inputs
-fi
diff --git a/pkgs/development/libraries/freedesktop/libSM/default.nix b/pkgs/development/libraries/freedesktop/libSM/default.nix
index 28295b4e9b42..d60b03c1dac2 100644
--- a/pkgs/development/libraries/freedesktop/libSM/default.nix
+++ b/pkgs/development/libraries/freedesktop/libSM/default.nix
@@ -8,7 +8,7 @@ derivation {
     url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libSM-6.0.2.tar.bz2;
     md5 = "0ecc3ec75391d9158f25a94a652bd387";
   };
-  buildInputs = [pkgconfig libX11 libICE];
-  _propagatedBuildInputs = [libICE];
+  buildInputs = [pkgconfig];
+  propagatedBuildInputs = [libX11 libICE];
   inherit stdenv;
 }
diff --git a/pkgs/development/libraries/freedesktop/libX11/builder.sh b/pkgs/development/libraries/freedesktop/libX11/builder.sh
index bb81d4bdb325..a73f5a6d5b8d 100755
--- a/pkgs/development/libraries/freedesktop/libX11/builder.sh
+++ b/pkgs/development/libraries/freedesktop/libX11/builder.sh
@@ -1,10 +1,3 @@
-#! /bin/sh
-
+#! /bin/sh -e
 . $stdenv/setup
-
 genericBuild
-
-if test -n "$_propagatedBuildInputs"; then
-    if ! test -x $out/nix-support; then mkdir $out/nix-support; fi
-    echo "$_propagatedBuildInputs" > $out/nix-support/propagated-build-inputs
-fi
diff --git a/pkgs/development/libraries/freedesktop/libX11/default.nix b/pkgs/development/libraries/freedesktop/libX11/default.nix
index f432a03a3f61..dc95abe5102a 100644
--- a/pkgs/development/libraries/freedesktop/libX11/default.nix
+++ b/pkgs/development/libraries/freedesktop/libX11/default.nix
@@ -8,7 +8,7 @@ derivation {
     url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libX11-6.2.1.tar.bz2;
     md5 = "59b6fa7cd6fe7ee1da92fd1b56d1cee3";
   };
-  buildInputs = [pkgconfig xproto xextensions libXtrans libXau];
-  _propagatedBuildInputs = [xproto xextensions libXtrans libXau];
+  buildInputs = [pkgconfig];
+  propagatedBuildInputs = [xproto xextensions libXtrans libXau];
   inherit stdenv;
 }
diff --git a/pkgs/development/libraries/freedesktop/xlibs/builder.sh b/pkgs/development/libraries/freedesktop/xlibs/builder.sh
index 0151f8c7eba5..df20779236f2 100755
--- a/pkgs/development/libraries/freedesktop/xlibs/builder.sh
+++ b/pkgs/development/libraries/freedesktop/xlibs/builder.sh
@@ -1,7 +1,5 @@
 #! /bin/sh -e
-
 . $stdenv/setup
-
-mkdir $out
-mkdir $out/nix-support
-echo "$propagatedBuildInputs" > $out/nix-support/propagated-build-inputs
+dontMake=1
+dontMakeInstall=1
+genericBuild
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index e7e9396a77d7..074e738dca37 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -64,7 +64,7 @@ pkgs=""
 if test -n "$buildinputs"; then
     buildInputs="$buildinputs" # compatibility
 fi
-for i in $buildInputs; do
+for i in $buildInputs $propagatedBuildInputs; do
     findInputs $i
 done
 
@@ -360,8 +360,10 @@ buildW() {
         return
     fi
 
-    echo "make flags: $makeFlags"
-    make $makeFlags
+    if test -z "$dontMake"; then
+        echo "make flags: $makeFlags"
+        make $makeFlags
+    fi
 }
 
 
@@ -381,16 +383,21 @@ installW() {
     if test -n "$preInstall"; then
         $preInstall
     fi
+
+    if ! test -x "$out"; then mkdir "$out"; fi
     
-    make install $installFlags
+    if test -z "$dontMakeInstall"; then
+        echo "install flags: $installFlags"
+        make install $installFlags
+    fi
 
     if test -z "$dontStrip" -a "$NIX_STRIP_DEBUG" = 1; then
-        find $out -name "*.a" -exec echo stripping {} \; -exec strip -S {} \;
+        find "$out" -name "*.a" -exec echo stripping {} \; -exec strip -S {} \;
     fi
 
     if test -n "$propagatedBuildInputs"; then
-        mkdir -f $out/nix-support
-        echo "$propagatedBuildInputs" > $out/nix-support/propagated-build-inputs
+        if ! test -x "$out/nix-support"; then mkdir "$out/nix-support"; fi
+        echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
     fi
 
     if test -n "$postInstall"; then