Author: eelco
Date: Mon Mar 28 16:48:02 2011
New Revision: 26581
URL: https://svn.nixos.org/websvn/nix/?rev=26581&sc=1

Log:
* Bazaar: depend on readline.

Modified:
   
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/default.nix
   
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/tools.nix

Modified: 
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/default.nix
==============================================================================
--- 
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/default.nix
     Mon Mar 28 16:33:33 2011        (r26580)
+++ 
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/default.nix
     Mon Mar 28 16:48:02 2011        (r26581)
@@ -12,7 +12,8 @@
 
   buildInputs = [ python wrapPython ];
 
-  pythonPath = [ pythonPackages.ssl ];
+  # Readline support is needed by bzrtools.
+  pythonPath = [ pythonPackages.ssl pythonPackages.readline ];
 
   installPhase = ''
     python setup.py install --prefix=$out

Modified: 
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/tools.nix
==============================================================================
--- 
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/tools.nix
       Mon Mar 28 16:33:33 2011        (r26580)
+++ 
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/tools.nix
       Mon Mar 28 16:48:02 2011        (r26581)
@@ -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 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to