* 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

3 files changed, 11 insertions, 4 deletions

diff --git a/pkgs/development/libraries/db4/builder.sh b/pkgs/development/libraries/db4/builder.sh
index d71bd8067436..b9d48b608032 100644
--- a/pkgs/development/libraries/db4/builder.sh
+++ b/pkgs/development/libraries/db4/builder.sh
@@ -4,11 +4,9 @@ preConfigure() {
     cd build_unix
     configureScript=../dist/configure
 }
-preConfigure=preConfigure
 
 postInstall() {
     rm -rf $out/docs
 }
-postInstall=postInstall
 
 genericBuild
diff --git a/pkgs/development/libraries/db4/db4-4.4.nix b/pkgs/development/libraries/db4/db4-4.4.nix
index 4304cd8f9f39..7444439fc73d 100644
--- a/pkgs/development/libraries/db4/db4-4.4.nix
+++ b/pkgs/development/libraries/db4/db4-4.4.nix
@@ -1,8 +1,10 @@
 {stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   name = "db4-4.4.20";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
     urls = [
       http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz
@@ -10,8 +12,11 @@ stdenv.mkDerivation ({
     ];
     md5 = "afd9243ea353bbaa04421488d3b37900";
   };
+  
   configureFlags = [
     (if cxxSupport then "--enable-cxx" else "--disable-cxx")
     (if compat185 then "--enable-compat185" else "--disable-compat185")
   ];
-} // (if stdenv.system == "i686-cygwin" then {patches = [./cygwin-4.4.patch];} else {}))
+
+  patches = [ ./cygwin-4.4.patch ];
+}
diff --git a/pkgs/development/libraries/db4/db4-4.5.nix b/pkgs/development/libraries/db4/db4-4.5.nix
index c67deaeda45a..e5cf6f35a01f 100644
--- a/pkgs/development/libraries/db4/db4-4.5.nix
+++ b/pkgs/development/libraries/db4/db4-4.5.nix
@@ -2,14 +2,18 @@
 
 stdenv.mkDerivation {
   name = "db4-4.5.20";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
     url = http://download-east.oracle.com/berkeley-db/db-4.5.20.tar.gz;
     md5 = "b0f1c777708cb8e9d37fb47e7ed3312d";
   };
+  
   configureFlags = [
     (if cxxSupport then "--enable-cxx" else "--disable-cxx")
     (if compat185 then "--enable-compat185" else "--disable-compat185")
   ];
+  
   patches = [./cygwin-4.5.patch ./register-race-fix.patch];
 }