summary refs log tree commit diff
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-02 10:42:36 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-02 10:42:36 +0000
commit097b7635af59d6b767aebfbeff1adca98e0898ee (patch)
treebd01750ec20fb187eb1441760c08f817561c42fc
parent6639c58398f5c79996ca32243f8d650242a5704e (diff)
downloadnixpkgs-097b7635af59d6b767aebfbeff1adca98e0898ee.tar
nixpkgs-097b7635af59d6b767aebfbeff1adca98e0898ee.tar.gz
nixpkgs-097b7635af59d6b767aebfbeff1adca98e0898ee.tar.bz2
nixpkgs-097b7635af59d6b767aebfbeff1adca98e0898ee.tar.lz
nixpkgs-097b7635af59d6b767aebfbeff1adca98e0898ee.tar.xz
nixpkgs-097b7635af59d6b767aebfbeff1adca98e0898ee.tar.zst
nixpkgs-097b7635af59d6b767aebfbeff1adca98e0898ee.zip
Explicitly add sqlite to calibre.buildInputs
The better way would be adding sqlite to
pythonPackages.sqlite3.propagatedBuildInputs but I don't want to touch this
code.

svn path=/nixpkgs/trunk/; revision=31197
-rw-r--r--pkgs/applications/misc/calibre/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 1685ef50b8d..b8100fbd709 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt4, icu
+, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite
 , pil, makeWrapper, unrar, chmlib, pythonPackages, xz
 }:
 
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
     [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
       fontconfig podofo qt4 pil chmlib icu
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
-      pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
+      pythonPackages.cssutils pythonPackages.beautifulsoap
+      pythonPackages.sqlite3 sqlite
     ];
 
   installPhase = ''