diff options
Diffstat (limited to 'pkgs/applications/misc/calibre/default.nix')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b9b14848370..8b04c63b39d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite -, pil, makeWrapper, unrar, chmlib, pythonPackages, xz +, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, udisks, libusb1, libmtp }: stdenv.mkDerivation rec { - name = "calibre-0.8.51"; + name = "calibre-0.8.70"; + # 0.9.* versions won't build: https://bugs.launchpad.net/calibre/+bug/1094719 src = fetchurl { - urls = [ - "http://calibre-ebook.googlecode.com/files/${name}.tar.xz" - "mirror://sourceforge/calibre/${name}.tar.xz" - ]; - sha256 = "1grcc0k9qpfpwp863x52rl9wj4wz61hcz67l8h2jmli0wxiq44z1"; + url = "mirror://sourceforge/calibre/${name}.tar.xz"; + sha256 = "12avwp8r6cnrw6c32gmd2hksa9rszdb76zs6fcmr3n8r1wkwa71g"; }; inherit python; @@ -23,7 +21,7 @@ stdenv.mkDerivation rec { fontconfig podofo qt4 pil chmlib icu pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup - pythonPackages.sqlite3 sqlite + pythonPackages.sqlite3 sqlite udisks libusb1 libmtp ]; installPhase = '' |