From 0a7b7374acb7b660509054481aae985876f293a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Mar 2011 16:48:02 +0000
Subject: [PATCH] * Bazaar: depend on readline.

svn path=/nixpkgs/branches/modular-python/; revision=26581
---
 pkgs/applications/version-management/bazaar/default.nix | 3 ++-
 pkgs/applications/version-management/bazaar/tools.nix   | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index 71572f85fbc..1bfaf0cbd5d 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ python wrapPython ];
 
-  pythonPath = [ pythonPackages.ssl ];
+  # Readline support is needed by bzrtools.
+  pythonPath = [ pythonPackages.ssl pythonPackages.readline ];
 
   installPhase = ''
     python setup.py install --prefix=$out
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index 5e5292cf130..5a4b706f418 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -1,9 +1,5 @@
 args : with args; 
 
-if ! bazaar.python.readlineSupport then 
-  throw "Bazaar Tools require readline support in python."
-else
-
 rec {
   version = "2.2.0";
   src = fetchurl {