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

calibre: 2.70.0 -> 2.73.0

Browse Source 
Fixes #20896.
This commit is contained in:
Franz Pletz 2016-12-04 14:16:40 +01:00
parent 63a5dd7e25
commit c09e043d53
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,12 +5,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.70.0"; version = "2.73.0";
name = "calibre-${version}"; name = "calibre-${version}";
src = fetchurl { src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
sha256 = "18iv1c2nx93gkfqa3k2m42dk4p59b9zp08fggb6imc1xqh2icfch"; sha256 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc";
}; };
patches = [ patches = [
@ -46,15 +46,11 @@ stdenv.mkDerivation rec {
''; '';
dontUseQmakeConfigure = true; dontUseQmakeConfigure = true;
# hack around a build problem
preBuild = ''
mkdir -p ../tmp.*/lib
'';
nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ];
buildInputs = [ buildInputs = [
poppler_utils libpng imagemagick libjpeg poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
] ++ (with python2Packages; [ ] ++ (with python2Packages; [
apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow