* 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

10 files changed, 0 insertions, 21 deletions

diff --git a/pkgs/development/compilers/gcc-2.95/builder.sh b/pkgs/development/compilers/gcc-2.95/builder.sh
index cf12872f1c375..5244d986da088 100644
--- a/pkgs/development/compilers/gcc-2.95/builder.sh
+++ b/pkgs/development/compilers/gcc-2.95/builder.sh
@@ -47,7 +47,6 @@ else
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     
     # Determine the frontends to build.
diff --git a/pkgs/development/compilers/gcc-3.3/builder.sh b/pkgs/development/compilers/gcc-3.3/builder.sh
index 20973c2623b94..5b80215cffb51 100644
--- a/pkgs/development/compilers/gcc-3.3/builder.sh
+++ b/pkgs/development/compilers/gcc-3.3/builder.sh
@@ -38,8 +38,6 @@ EOF
     configureFlags="--enable-languages=$langs"
 }
 
-preConfigure=preConfigure
-
 
 postConfigure() {
     if test "$noSysDirs" = "1"; then
@@ -82,8 +80,6 @@ postConfigure() {
     fi
 }
 
-postConfigure=postConfigure
-
 
 buildFlags="bootstrap"
 
diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc-3.4/builder.sh
index eb1f211dce8fb..5a43d600a5034 100644
--- a/pkgs/development/compilers/gcc-3.4/builder.sh
+++ b/pkgs/development/compilers/gcc-3.4/builder.sh
@@ -35,7 +35,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -44,7 +43,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-4.0/builder.sh b/pkgs/development/compilers/gcc-4.0/builder.sh
index 5df3168027fe7..08622c1899ed3 100644
--- a/pkgs/development/compilers/gcc-4.0/builder.sh
+++ b/pkgs/development/compilers/gcc-4.0/builder.sh
@@ -54,7 +54,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -63,7 +62,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-4.1/builder.sh b/pkgs/development/compilers/gcc-4.1/builder.sh
index c17d040370273..f8abca122570d 100644
--- a/pkgs/development/compilers/gcc-4.1/builder.sh
+++ b/pkgs/development/compilers/gcc-4.1/builder.sh
@@ -50,7 +50,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -59,7 +58,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-4.2/builder.sh b/pkgs/development/compilers/gcc-4.2/builder.sh
index ee11e974a4046..d749fc08d2a06 100644
--- a/pkgs/development/compilers/gcc-4.2/builder.sh
+++ b/pkgs/development/compilers/gcc-4.2/builder.sh
@@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -60,7 +59,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-4.3/builder.sh b/pkgs/development/compilers/gcc-4.3/builder.sh
index a6bbbd7a052ce..2bc011e3e6e13 100644
--- a/pkgs/development/compilers/gcc-4.3/builder.sh
+++ b/pkgs/development/compilers/gcc-4.3/builder.sh
@@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -60,7 +59,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-apple/builder.sh b/pkgs/development/compilers/gcc-apple/builder.sh
index 8485b6efec0f8..a10813e5e33c5 100644
--- a/pkgs/development/compilers/gcc-apple/builder.sh
+++ b/pkgs/development/compilers/gcc-apple/builder.sh
@@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     
     # Determine the frontends to build.
@@ -72,7 +71,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/gcc-upc-4.0/builder.sh b/pkgs/development/compilers/gcc-upc-4.0/builder.sh
index 5df3168027fe7..08622c1899ed3 100644
--- a/pkgs/development/compilers/gcc-upc-4.0/builder.sh
+++ b/pkgs/development/compilers/gcc-upc-4.0/builder.sh
@@ -54,7 +54,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -63,7 +62,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
diff --git a/pkgs/development/compilers/llvm/builder.sh b/pkgs/development/compilers/llvm/builder.sh
index 962e8d372388d..fd44f6bf6a381 100644
--- a/pkgs/development/compilers/llvm/builder.sh
+++ b/pkgs/development/compilers/llvm/builder.sh
@@ -51,7 +51,6 @@ if test "$noSysDirs" = "1"; then
 fi
 
 
-preConfigure=preConfigure
 preConfigure() {
     # Perform the build in a different directory.
     mkdir ../build
@@ -60,7 +59,6 @@ preConfigure() {
 }
 
 
-postInstall=postInstall
 postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.