mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
* keepnote: depend on pythonPackages.sqlite3 rather than pythonFull.
svn path=/nixpkgs/branches/modular-python/; revision=26582
This commit is contained in:
parent
0a7b7374ac
commit
7b3bda471d
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue