diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-16 18:21:03 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-16 18:21:03 +0000 |
commit | 405f746280c791a9ddf7de40be8f983a5ec21356 (patch) | |
tree | 267b256180881adda971f46c0ce5fc2f212b094d | |
parent | 27855da0d9e5b835848019f6af627470aa2f4137 (diff) |
* More GHC cleanup.
svn path=/nixpkgs/trunk/; revision=15093
-rw-r--r-- | pkgs/development/compilers/ghc/6.4.2.nix | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/builder.sh | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/development/compilers/ghc/6.4.2.nix b/pkgs/development/compilers/ghc/6.4.2.nix index c175f242ff109..9fccf5307c504 100644 --- a/pkgs/development/compilers/ghc/6.4.2.nix +++ b/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"; diff --git a/pkgs/development/compilers/ghc/builder.sh b/pkgs/development/compilers/ghc/builder.sh deleted file mode 100644 index 5d05417a7e850..0000000000000 --- a/pkgs/development/compilers/ghc/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25d7dc0c59742..7378f2741ae56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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; }; |