From 7b3bda471d846664c3e7d683c60b3fa0356d3032 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Mar 2011 16:48:31 +0000
Subject: [PATCH] * keepnote: depend on pythonPackages.sqlite3 rather than
 pythonFull.

svn path=/nixpkgs/branches/modular-python/; revision=26582
---
 pkgs/applications/office/keepnote/default.nix |  5 +++--
 pkgs/top-level/all-packages.nix               | 12 ------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix
index dc7946d1e82e..514b8fd3151e 100644
--- a/pkgs/applications/office/keepnote/default.nix
+++ b/pkgs/applications/office/keepnote/default.nix
@@ -1,14 +1,15 @@
-{stdenv, fetchurl, buildPythonPackage, pygtk}:
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pygtk }:
 
 buildPythonPackage {
   name = "keepnote-0.6.5";
+  namePrefix = "";
 
   src = fetchurl {
     url = http://rasm.ods.org/keepnote/download/keepnote-0.6.5.tar.gz;
     sha256 = "0kipcy90r50z4m9p8pyy9wi4dknsiwdrgy974xgakris2rh4lafw";
   };
 
-  propagatedBuildInputs = [ pygtk ];
+  propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk ];
 
   # Testing fails.
   doCheck = false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b126367dbce7..c9553be74333 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6132,18 +6132,6 @@ let
   kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { };
 
   keepnote = callPackage ../applications/office/keepnote {
-    # I did not find any better way of reusing buildPythonPackage+setuptools
-    # for a python with openssl support
-    buildPythonPackage = assert pythonFull.sqliteSupport;
-      import ../development/python-modules/generic {
-        inherit makeWrapper lib;
-        python = pythonFull;
-        setuptools = builderDefsPackage (import ../development/python-modules/setuptools) {
-          inherit makeWrapper;
-          python = pythonFull;
-        };
-      };
-    # How could this pygtk use also pythonFull, I don't know.
     pygtk = pyGtkGlade;
   };