* propagated-build-inputs should now be placed in $out/nix-support.

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

pkgs/development/tools/parsing/flex/builder-new.sh

@@ -1,12 +1,13 @@
-#! /bin/sh
+#! /bin/sh -e
 
 export buildinputs="$yacc $m4"
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-tar xvfj $src || exit 1
-cd flex-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
+tar xvfj $src
+cd flex-*
+./configure --prefix=$out
+make
+make install
 
-echo "$m4" > $out/propagated-build-inputs || exit 1
+mkdir $out/nix-support
+echo "$m4" > $out/nix-support/propagated-build-inputs

pkgs/development/tools/parsing/pgen/builder.sh

@@ -1,17 +1,18 @@
-#! /bin/sh
+#! /bin/sh -e
 
 buildinputs="$aterm $getopt $toolbuslib $ptsupport $sdfsupport $asfsupport $ascsupport $sglr"
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-tar zxf $src || exit 1
-cd pgen-* || exit 1
+tar zxf $src
+cd pgen-*
 ./configure --prefix=$out --with-aterm=$aterm \
                           --with-toolbuslib=$toolbuslib \
                           --with-pt-support=$ptsupport \
                           --with-sdf-support=$sdfsupport \
                           --with-asf-support=$asfsupport \
                           --with-asc-support=$asfsupport \
-                          --with-sglr=$sglr  || exit 1
-make install || exit 1
+                          --with-sglr=$sglr 
+make install
 
-echo "$getopt" > $out/propagated-build-inputs || exit 1
+mkdir $out/nix-support
+echo "$getopt" > $out/nix-support/propagated-build-inputs

pkgs/development/tools/parsing/sdf2/builder.sh

@@ -1,11 +1,12 @@
-#! /bin/sh
+#! /bin/sh -e
 
 buildinputs="$aterm $getopt"
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-tar zxf $src || exit 1
-cd sdf2-bundle-* || exit 1
-./configure --prefix=$out --with-aterm=$aterm || exit 1
-make install || exit 1
+tar zxf $src
+cd sdf2-bundle-*
+./configure --prefix=$out --with-aterm=$aterm
+make install
 
-echo "$getopt" > $out/propagated-build-inputs || exit 1
+mkdir $out/nix-support
+echo "$getopt" > $out/nix-support/propagated-build-inputs