* More GHC cleanup.

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

pkgs/development/compilers/ghc/6.4.2.nix

@@ -1,15 +1,25 @@
-{stdenv, gcc, fetchurl, perl, ghc, m4, readline, ncurses, gmp}:
+{stdenv, fetchurl, perl, ghc, m4, readline, ncurses, gmp}:
 
 stdenv.mkDerivation {
   name = "ghc-6.4.2";
+  
   src = fetchurl {
     url = http://www.haskell.org/ghc/dist/6.4.2/ghc-6.4.2-src.tar.bz2;
     md5 = "a394bf14e94c3bca5507d568fcc03375";
   };
+  
   buildInputs = [perl ghc m4];
+  
   propagatedBuildInputs = [readline ncurses gmp];
-  builder = ./builder.sh;
-  inherit gcc;
+
+  configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc";
+
+  preConfigure =
+    ''
+      # Don't you hate build processes that write in $HOME? :-(
+      export HOME=$(pwd)/fake-home
+      mkdir -p $HOME
+    '';
 
   meta = {
     description = "The Glasgow Haskell Compiler";

pkgs/development/compilers/ghc/builder.sh

@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--with-gcc=$gcc/bin/gcc"
-
-# Don't you hate build processes that write in $HOME? :-(
-export HOME=$(pwd)/fake-home
-mkdir -p $HOME
-
-genericBuild

pkgs/top-level/all-packages.nix

@@ -1851,7 +1851,6 @@ let
 
   ghc64 = import ../development/compilers/ghc/6.4.2.nix {
     inherit fetchurl stdenv perl ncurses readline m4 gmp;
-    gcc = stdenv.gcc;
     ghc = ghcboot;
   };