* The `patch' command is now part of stdenv, so it no longer needs to

  be passed to derivations that need to apply patches.
* GCC 3.4 is now the default compiler (old GCC renamed to `gcc-3.3').
* The temporary GCCs built during the stdenvLinux bootstrap are now
  built without C++ support and without profiling.
* Remove fixincl in GCC 3.4 to prevent a retained dependency on the
  previous GCC.
* Always set $prefix in setup.sh, even when there is no configure
  script.

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

5 files changed, 6 insertions, 4 deletions

diff --git a/pkgs/development/compilers/gcc-2.95/default.nix b/pkgs/development/compilers/gcc-2.95/default.nix
index 698bea7950f6..c95a90277585 100644
--- a/pkgs/development/compilers/gcc-2.95/default.nix
+++ b/pkgs/development/compilers/gcc-2.95/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patch, noSysDirs
+{ stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langF77 ? false
 }:
 
@@ -13,6 +13,5 @@ stdenv.mkDerivation {
   };
   # !!! apply only if noSysDirs is set
   patches = [./no-sys-dirs.patch];
-  buildInputs = [patch];
   inherit noSysDirs langC langCC langF77;
 }
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc-3.3/builder.sh
index 22d1e38707a0..22d1e38707a0 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc-3.3/builder.sh
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc-3.3/default.nix
index 46b6a2d863e3..46b6a2d863e3 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc-3.3/default.nix
diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc-3.4/builder.sh
index 2d425eabc73a..60af74ed7654 100644
--- a/pkgs/development/compilers/gcc-3.4/builder.sh
+++ b/pkgs/development/compilers/gcc-3.4/builder.sh
@@ -71,6 +71,10 @@ postInstall() {
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
     find $out/include -name "*.gch" -exec rm -rf {} \; -prune
+
+    # Remove `fixincl' to prevent a retained dependency on the
+    # previous gcc.
+    rm -rf $out/libexec/gcc/*/*/install-tools
 }
 
 
diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc-3.4/default.nix
index c29a9502854a..b766c972344e 100644
--- a/pkgs/development/compilers/gcc-3.4/default.nix
+++ b/pkgs/development/compilers/gcc-3.4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patch, noSysDirs
+{ stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langF77 ? false
 , profiledCompiler ? false
 }:
@@ -14,6 +14,5 @@ stdenv.mkDerivation {
   };
   # !!! apply only if noSysDirs is set
   patches = [./no-sys-dirs.patch];
-  buildInputs = [patch];
   inherit noSysDirs langC langCC langF77 profiledCompiler;
 }