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

* ghc should call the gcc instance it's been built with (to compile Haskell code)

Browse Source 
svn path=/nixpkgs/trunk/; revision=4658
This commit is contained in:
Andres Löh 2006-01-31 23:58:32 +00:00
parent 03ffede228
commit 51e287469c
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/ghc/builder.sh Normal file
View File

@ -0,0 +1,5 @@
source $stdenv/setup
configureFlags="--with-gcc=$gcc/bin/gcc"
genericBuild

4
pkgs/development/compilers/ghc/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, ghc, m4, readline, ncurses}: {stdenv, gcc, fetchurl, perl, ghc, m4, readline, ncurses}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ghc-6.4.1"; name = "ghc-6.4.1";
@ -8,4 +8,6 @@ stdenv.mkDerivation {
}; };
buildInputs = [perl ghc m4]; buildInputs = [perl ghc m4];
propagatedBuildInputs = [readline ncurses]; propagatedBuildInputs = [readline ncurses];
builder = ./builder.sh;
inherit gcc;
} }

1
pkgs/system/all-packages-generic.nix
View File

@ -686,6 +686,7 @@ rec {
ghc = (import ../development/compilers/ghc) { ghc = (import ../development/compilers/ghc) {
inherit fetchurl stdenv perl ncurses readline; inherit fetchurl stdenv perl ncurses readline;
gcc = stdenv.gcc;
ghc = ghcboot; ghc = ghcboot;
m4 = gnum4; m4 = gnum4;
}; };