* Got rid of a lot of "postInstall=postInstall" and similar lines in

builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276

pkgs/misc/busybox/builder.sh

@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-export installFlags="PREFIX=$out"
-
-preBuild() {
-	cp $config .config
-	make include/bb_config.h
-}
-
-preBuild=preBuild
-
-genericBuild

pkgs/misc/busybox/busybox-1.2.nix

@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation {
   name = "busybox-1.2.2.1";
-  builder = ./builder.sh;
 
   src = fetchurl {
     url = http://busybox.net/downloads/busybox-1.2.2.1.tar.bz2;
@@ -10,7 +9,13 @@ stdenv.mkDerivation {
   };
 
   # inherit gccCross;
+  
   # buildinputs = [binutilsCross];
+  
   # fixme, need a decent config for MIPS or so
-  config = ./x86-config-1.2;
+  preBuild = ''
+    installFlags="PREFIX=$out"
+    cp ${./x86-config-1.2} .config
+    make include/bb_config.h
+  '';
 }

pkgs/misc/emulators/atari800/builder.sh

@@ -1,11 +1,9 @@
 source $stdenv/setup
 
-preConfigure=preConfigure
 preConfigure() {
     cd src
 }
 
-postInstall=postInstall
 postInstall() {
     romsDir=$out/share/atari800/roms
     ensureDir $romsDir

pkgs/misc/ghostscript/builder.sh

@@ -1,6 +1,5 @@
 source $stdenv/setup
 
-preConfigure=preConfigure
 preConfigure() {
     # "ijs" is impure: it contains symlinks to /usr/share/automake etc.!
     rm -rf ijs/ltmain.sh
@@ -11,7 +10,6 @@ preConfigure() {
 
 installTargets="install install-so install-data install-doc install-man"
 
-postInstall=postInstall
 postInstall() {
     for i in $fonts; do
         (cd $out/share/ghostscript && tar xvfz $i)

pkgs/misc/linuxwacom/builder.sh

@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-postInstall() {
-  if test -n "$udevSupport"; then
-    ensureDir $out/etc/udev/rules.d
-    cp $udevRules $out/etc/udev/rules.d/10-wacom.rules
-  fi
-}
-
-postInstall=postInstall
-
-genericBuild

pkgs/misc/linuxwacom/default.nix

@@ -2,12 +2,18 @@
 
 stdenv.mkDerivation {
   name = "linuxwacom-0.7.2";
-  builder = ./builder.sh;
+  
   src = fetchurl {
     url = http://nixos.org/tarballs/linuxwacom-0.7.2.tar.bz2;
     md5 = "3f6290101d5712a24097243ca9f092ed";
   };
+  
   buildInputs = [libX11 libXi];
-  udevRules = ./10-wacom.rules;
-  inherit udevSupport;
+  
+  postInstall = ''
+    if test -n "${toString udevSupport}"; then
+      ensureDir $out/etc/udev/rules.d
+      cp ${./10-wacom.rules} $out/etc/udev/rules.d/10-wacom.rules
+    fi
+  '';
 }

pkgs/misc/sane-backends/builder.sh

@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-postInstall() {
-  if test "$udevSupport" = "1" ; then
-    ensureDir $out/etc/udev/rules.d/
-    cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
-  fi
-}
-
-postInstall=postInstall
-
-genericBuild

pkgs/misc/sane-backends/default.nix

@@ -5,17 +5,27 @@ assert hotplugSupport -> stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
   name = "sane-backends-1.0.18";
-  builder = ./builder.sh;
+  
   src = fetchurl {
     url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.18/sane-backends-1.0.18.tar.gz;
     md5 = "7ca7e2908e24721471de92cf40c75e60";
   };
+  
   udevSupport = hotplugSupport;
 
-  buildInputs = (if libusb != null then [libusb] else []);
+  buildInputs = if libusb != null then [libusb] else [];
 
-  preInstall = (if gt68xxFirmware != null then 
-	"mkdir -p \${out}/share/sane/gt68xx ; ln -s " +  
-	(gt68xxFirmware {inherit fetchurl;})+ " \${out}/share/sane/gt68xx/PS1fw.usb "
-	 else "");
+  postInstall = ''
+    if test "$udevSupport" = "1"; then
+      ensureDir $out/etc/udev/rules.d/
+      cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
+    fi
+  '';
+
+  preInstall =
+    if gt68xxFirmware != null then 
+      "mkdir -p \${out}/share/sane/gt68xx ; ln -s " +  
+      (gt68xxFirmware {inherit fetchurl;}) +
+      "  \${out}/share/sane/gt68xx/PS1fw.usb "
+    else "";
 }

pkgs/misc/tex/tetex/builder.sh

@@ -19,10 +19,4 @@ configureFlags="\
   --with-system-ncurses \
   "
 
-postInstall() {
-    ensureDir "$out/nix-support"
-    cp $setupHook $out/nix-support/setup-hook
-}
-postInstall=postInstall
-
 genericBuild