From 0dcce7669eaa1879ea84ece61d80ce538b1545a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 7 Jul 2009 22:44:29 +0000
Subject: [PATCH] Tahoe: Use `pysqlite', used by the `backup' command.

svn path=/nixpkgs/trunk/; revision=16231
---
 pkgs/tools/networking/p2p/tahoe/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/p2p/tahoe/default.nix b/pkgs/tools/networking/p2p/tahoe/default.nix
index c0646037f575..90ab9575f0f8 100644
--- a/pkgs/tools/networking/p2p/tahoe/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, unzip, buildPythonPackage, twisted, foolscap, nevow
-, simplejson, zfec, pycryptopp, nettools }:
+, simplejson, zfec, pycryptopp, pysqlite, nettools }:
 
 buildPythonPackage (rec {
   name = "tahoe-1.4.1";
@@ -29,8 +29,10 @@ buildPythonPackage (rec {
   '';
 
   buildInputs = [ unzip ];
+
+  # The `backup' command works best with `pysqlite'.
   propagatedBuildInputs = [
-    twisted foolscap nevow simplejson zfec pycryptopp
+    twisted foolscap nevow simplejson zfec pycryptopp pysqlite
   ];
 
   # FIXME: Many tests try to write to the Nix store or to $HOME, which
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f689f4f9c73..2296cb9cda45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7020,7 +7020,7 @@ let
   tahoe = import ../tools/networking/p2p/tahoe {
     inherit fetchurl unzip nettools buildPythonPackage;
     inherit (pythonPackages) twisted foolscap simplejson nevow zfec
-      pycryptopp;
+      pycryptopp pysqlite;
   };
 
   tailor = builderDefsPackage (import ../applications/version-management/tailor) {