diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 16:48:02 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 16:48:02 +0000 |
| commit | 0a7b7374acb7b660509054481aae985876f293a2 (patch) | |
| tree | a039ee2ea7ef7522cf943ffa0afb31b89318be4e /pkgs/applications/version-management/bazaar | |
| parent | 47adaa80e310ed270b2bccb05cf2c10d30cde453 (diff) | |
* Bazaar: depend on readline.
svn path=/nixpkgs/branches/modular-python/; revision=26581
Diffstat (limited to 'pkgs/applications/version-management/bazaar')
| -rw-r--r-- | pkgs/applications/version-management/bazaar/default.nix | 3 | ||||
| -rw-r--r-- | 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 71572f85fbc8..1bfaf0cbd5d2 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 5e5292cf1306..5a4b706f418a 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 { |