From a52d7b00f3c5bf8a9067d57278c1e9a285614632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 22 Jul 2008 13:02:11 +0000 Subject: [PATCH] * missing file from last commit svn path=/nixpkgs/trunk/; revision=12393 --- pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix b/pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix index 96655d5d7b37..60047acea1e2 100644 --- a/pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix +++ b/pkgs/development/compilers/ghc-6.8/ghc-6.8.3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline, ghc, perl, m4, gmp, ncurses}: +{stdenv, fetchurl, readline, ghc, perl, m4, gmp, ncurses, haddock}: stdenv.mkDerivation (rec { name = "ghc-6.8.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { } ]; - buildInputs = [ghc readline perl m4 gmp]; + buildInputs = [ghc readline perl m4 gmp haddock]; # The setup hook is executed by other packages building with ghc. # It then looks for package configurations that are available and @@ -31,10 +31,14 @@ stdenv.mkDerivation (rec { "--with-gcc=${gcc}/bin/gcc" ]; - preConfigure = " + preConfigure = '' # still requires a hack for ncurses - sed -i \"s|^\\\(ld-options.*$\\\)|\\\1 -L${ncurses}/lib|\" libraries/readline/readline.buildinfo.in - "; + sed -i "s|^\(ld-options.*$\)|\1 -L${ncurses}/lib|" libraries/readline/readline.buildinfo.in + # build haddock docs + echo "HADDOCK_DOCS = YES" >> mk/build.mk + ''; + + installTargets = ["install" "install-docs"]; inherit (stdenv) gcc; inherit readline gmp ncurses;