fixed ghc-6.6.1 and darcs

svn path=/nixpkgs/trunk/; revision=10901

3 files changed, 9 insertions, 6 deletions

diff --git a/pkgs/development/compilers/ghc-6.6.1/default.nix b/pkgs/development/compilers/ghc-6.6.1/default.nix
index 14a59aeeeba..841306578eb 100644
--- a/pkgs/development/compilers/ghc-6.6.1/default.nix
+++ b/pkgs/development/compilers/ghc-6.6.1/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline, ghc, perl, m4, gmp, ncurses}:
+{stdenv, fetchurl, readline, ghc, perl58, m4, gmp, ncurses}:
 
 stdenv.mkDerivation (rec {
   name = "ghc-6.6.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation (rec {
     }
   ];
 
-  buildInputs = [ghc readline perl m4 gmp];
+  buildInputs = [ghc readline perl58 m4 gmp];
 
   setupHook = ./setup-hook.sh;
 
@@ -38,6 +38,8 @@ stdenv.mkDerivation (rec {
   preConfigure = ''
     # still requires a hack for ncurses
     sed -i "s|^\(library-dirs.*$\)|\1 \"${ncurses}/lib\"|" libraries/readline/package.conf.in
+    # fix for gcc 4.2
+    echo "SplitObjs=NO" >> mk/build.mk
   '';
 
   inherit (stdenv) gcc;
diff --git a/pkgs/development/compilers/ghc-6.6.1/setup-hook.sh b/pkgs/development/compilers/ghc-6.6.1/setup-hook.sh
index 23da6de0382..c6f769a0040 100644
--- a/pkgs/development/compilers/ghc-6.6.1/setup-hook.sh
+++ b/pkgs/development/compilers/ghc-6.6.1/setup-hook.sh
@@ -4,7 +4,7 @@ mkdir -p $ghc_support
 
 # Create isolated package config
 packages_db=$ghc_support/package.conf
-cp $ghc/lib/ghc-*/package.conf $packages_db
+cp @out@/lib/ghc-*/package.conf $packages_db
 chmod +w $packages_db
 
 # Generate wrappers for GHC that use the isolated package config
@@ -13,7 +13,7 @@ makeWrapper() {
   wrapper="$ghc_support/$wrapperName"
   shift #the other arguments are passed to the source app
   echo '#!'"$SHELL" > "$wrapper"
-  echo "exec \"$ghc/bin/$wrapperName\" $@" '"$@"' > "$wrapper"
+  echo "exec \"@out@/bin/$wrapperName\" $@" '"$@"' > "$wrapper"
   chmod +x "$wrapper"
 }
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e77dfd5542..8728b5e0d64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1394,7 +1394,7 @@ rec {
   };
 
   ghc661 = import ../development/compilers/ghc-6.6.1 {
-    inherit fetchurl stdenv readline perl gmp ncurses;
+    inherit fetchurl stdenv readline perl58 gmp ncurses;
     m4 = gnum4;
     ghc = ghcboot;
   };
@@ -4665,7 +4665,8 @@ rec {
   };
   
   darcs = import ../applications/version-management/darcs {
-    inherit fetchurl stdenv zlib ncurses curl ghc;
+    inherit fetchurl stdenv zlib ncurses curl;
+    ghc = ghc661;    
   };
 
   # some speed bottle necks are resolved in this version I think .. perhaps you like to try it?