* 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

2 files changed, 3 insertions, 6 deletions

diff --git a/pkgs/development/libraries/qt-3/builder.sh b/pkgs/development/libraries/qt-3/builder.sh
index b403f036b0e97..460ae17766af7 100644
--- a/pkgs/development/libraries/qt-3/builder.sh
+++ b/pkgs/development/libraries/qt-3/builder.sh
@@ -1,10 +1,6 @@
 source $stdenv/setup
 
-ensureDir $out/nix-support
-substitute "$hook" "$out/nix-support/setup-hook" --subst-var out
 
-
-preConfigure=preConfigure
 preConfigure() {
 
     # Patch some of the configure files a bit to get of global paths.
@@ -30,7 +26,6 @@ configureScript() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Qt's `make install' is broken; it copies ./bin/qmake, which
     # is a symlink to ./qmake/qmake.  So we end up with a dangling
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index e26c9072076db..e1bc3f8974187 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -21,7 +21,9 @@ stdenv.mkDerivation {
   name = "qt-3.3.8";
 
   builder = ./builder.sh;
-  hook = ./setup-hook.sh;  
+
+  setupHook = ./setup-hook.sh;
+
   src = fetchurl {
     url = ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8.tar.bz2;
     sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";