* 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

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;
 }

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
 }
 
 

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;
 }