diff --git a/pkgs/development/compilers/ghc/builder.sh b/pkgs/development/compilers/ghc/builder.sh new file mode 100644 index 000000000000..fed830274480 --- /dev/null +++ b/pkgs/development/compilers/ghc/builder.sh @@ -0,0 +1,5 @@ +source $stdenv/setup + +configureFlags="--with-gcc=$gcc/bin/gcc" + +genericBuild diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/default.nix index 1fdeef20c19d..670c146b2def 100644 --- a/pkgs/development/compilers/ghc/default.nix +++ b/pkgs/development/compilers/ghc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, ghc, m4, readline, ncurses}: +{stdenv, gcc, fetchurl, perl, ghc, m4, readline, ncurses}: stdenv.mkDerivation { name = "ghc-6.4.1"; @@ -8,4 +8,6 @@ stdenv.mkDerivation { }; buildInputs = [perl ghc m4]; propagatedBuildInputs = [readline ncurses]; + builder = ./builder.sh; + inherit gcc; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 03e245fcc220..5b09d4cebf7a 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -686,6 +686,7 @@ rec { ghc = (import ../development/compilers/ghc) { inherit fetchurl stdenv perl ncurses readline; + gcc = stdenv.gcc; ghc = ghcboot; m4 = gnum4; };