public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calibre: make build by minor upgrade + new dependencies 

0.9.* won't build: https://bugs.launchpad.net/calibre/+bug/1094719
This commit is contained in:
Vladimír Čunát 2013-02-13 09:18:27 +01:00
parent b58f8f0ddb
commit ee9a5d864c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/misc/calibre/default.nix
View File

@ -1,17 +1,15 @@
{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite , 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 { 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 { src = fetchurl {
urls = [ url = "mirror://sourceforge/calibre/${name}.tar.xz";
"http://calibre-ebook.googlecode.com/files/${name}.tar.xz" sha256 = "12avwp8r6cnrw6c32gmd2hksa9rszdb76zs6fcmr3n8r1wkwa71g";
"mirror://sourceforge/calibre/${name}.tar.xz"
];
sha256 = "1grcc0k9qpfpwp863x52rl9wj4wz61hcz67l8h2jmli0wxiq44z1";
}; };
inherit python; inherit python;
@ -23,7 +21,7 @@ stdenv.mkDerivation rec {
fontconfig podofo qt4 pil chmlib icu fontconfig podofo qt4 pil chmlib icu
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.cssutils pythonPackages.beautifulsoup
pythonPackages.sqlite3 sqlite pythonPackages.sqlite3 sqlite udisks libusb1 libmtp
]; ];
installPhase = '' installPhase = ''