From 35d05e3cc1cb7c661ba9006e71784fea5679b6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 8 Jan 2008 08:45:39 +0000 Subject: [PATCH] * statically fix the gcc instance used by ghc svn path=/nixpkgs/trunk/; revision=10099 --- pkgs/development/compilers/ghc-6.8/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc-6.8/default.nix b/pkgs/development/compilers/ghc-6.8/default.nix index e4f8ea274b0..5bfe82c7a7a 100644 --- a/pkgs/development/compilers/ghc-6.8/default.nix +++ b/pkgs/development/compilers/ghc-6.8/default.nix @@ -29,12 +29,18 @@ stdenv.mkDerivation (rec { cat $setupHook >> $out/nix-support/setup-hook "; - configureFlags="--with-gmp-libraries=${gmp}/lib --with-readline-libraries=${readline}/lib --with-gmp-includes=${gmp}/include"; + configureFlags=[ + "--with-gmp-libraries=${gmp}/lib" + "--with-readline-libraries=${readline}/lib" + "--with-gmp-includes=${gmp}/include" + "--with-gcc=${gcc}/bin/gcc" + ]; preConfigure = " # still requires a hack for ncurses sed -i \"s|^\\\(ld-options.*$\\\)|\\\1 -L${ncurses}/lib|\" libraries/readline/readline.buildinfo.in "; + inherit (stdenv) gcc; inherit readline gmp ncurses; })