From dae40d9c62becd77445349ef8b74d4ff0055e5ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Apr 2009 19:59:41 +0000
Subject: [PATCH] * GHC apparently works with Perl 5.10 now.

svn path=/nixpkgs/trunk/; revision=15101
---
 pkgs/development/compilers/ghc/6.10.2-binary.nix | 4 ++--
 pkgs/top-level/all-packages.nix                  | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 8f3b6833fa1..e00702b8d84 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, libedit, ncurses, gmp, makeWrapper}:
+{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
 
 stdenv.mkDerivation rec {
   version = "6.10.2";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       }
     else throw "cannot bootstrap GHC on this platform"; 
 
-  buildInputs = [perl makeWrapper];
+  buildInputs = [perl];
 
   postUnpack =
     # Strip is harmful, see also below. It's important that this happens
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38c1a14b576..8e32139cb42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1868,9 +1868,7 @@ let
   });
 
   ghc6103Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix {
-    inherit fetchurl stdenv ncurses gmp libedit makeWrapper;
-    # readline = if stdenv.system == "i686-linux" then readline4 else readline;
-    perl = perl58;
+    inherit fetchurl stdenv perl ncurses gmp libedit;
   });
 
   gprolog = import ../development/compilers/gprolog {