public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* More GHC cleanup.

Browse Source 
svn path=/nixpkgs/trunk/; revision=15093
This commit is contained in:
Eelco Dolstra 2009-04-16 18:21:03 +00:00
parent 27855da0d9
commit 405f746280
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/compilers/ghc/6.4.2.nix
View File

@ -1,15 +1,25 @@
{stdenv, gcc, fetchurl, perl, ghc, m4, readline, ncurses, gmp}: {stdenv, fetchurl, perl, ghc, m4, readline, ncurses, gmp}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ghc-6.4.2"; name = "ghc-6.4.2";
src = fetchurl { src = fetchurl {
url = http://www.haskell.org/ghc/dist/6.4.2/ghc-6.4.2-src.tar.bz2; url = http://www.haskell.org/ghc/dist/6.4.2/ghc-6.4.2-src.tar.bz2;
md5 = "a394bf14e94c3bca5507d568fcc03375"; md5 = "a394bf14e94c3bca5507d568fcc03375";
}; };
buildInputs = [perl ghc m4]; buildInputs = [perl ghc m4];
propagatedBuildInputs = [readline ncurses gmp]; 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 = { meta = {
description = "The Glasgow Haskell Compiler"; description = "The Glasgow Haskell Compiler";

9
pkgs/development/compilers/ghc/builder.sh
View File

@ -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

1
pkgs/top-level/all-packages.nix
View File

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