From f9ecf5a44f6c4ac0736ba56dc7dcfb18980c5ffd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 11 Dec 2009 13:58:36 +0000
Subject: [PATCH] fix build of ghc-6.8.2
svn path=/nixpkgs/trunk/; revision=18899
---
pkgs/top-level/all-packages.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fc9ac82aae..95e5b867ac0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1889,7 +1889,7 @@ let
ghc642Binary = lowPrio (import ../development/compilers/ghc/6.4.2-binary.nix {
inherit fetchurl stdenv ncurses gmp;
- readline = if stdenv.system == "i686-linux" then readline4 else readline;
+ readline = if stdenv.system == "i686-linux" then readline4 else readline5;
perl = perl58;
});
@@ -1925,7 +1925,8 @@ let
haskellPackages_ghc682 = import ./haskell-packages.nix {
inherit pkgs;
ghc = import ../development/compilers/ghc/6.8.2.nix {
- inherit fetchurl stdenv readline perl gmp ncurses m4;
+ inherit fetchurl stdenv perl gmp ncurses m4;
+ readline = readline5;
ghc = ghc642Binary;
};
};