diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-12-04 14:16:40 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-12-04 14:57:34 +0100 |
| commit | c09e043d531ba693b881598e37621a06d592767a (patch) | |
| tree | e8fe1b6b5503205489caa05e8551fede4b1f3e35 /pkgs/applications/misc | |
| parent | 63a5dd7e25c41a4b7074cbc9f93fe8b170f48200 (diff) | |
| download | nixpkgs-c09e043d531ba693b881598e37621a06d592767a.tar nixpkgs-c09e043d531ba693b881598e37621a06d592767a.tar.gz nixpkgs-c09e043d531ba693b881598e37621a06d592767a.tar.bz2 nixpkgs-c09e043d531ba693b881598e37621a06d592767a.tar.lz nixpkgs-c09e043d531ba693b881598e37621a06d592767a.tar.xz nixpkgs-c09e043d531ba693b881598e37621a06d592767a.tar.zst nixpkgs-c09e043d531ba693b881598e37621a06d592767a.zip | |
calibre: 2.70.0 -> 2.73.0
Fixes #20896.
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 4fcb3a085bd..b98d327d3b8 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.70.0"; + version = "2.73.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "18iv1c2nx93gkfqa3k2m42dk4p59b9zp08fggb6imc1xqh2icfch"; + sha256 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc"; }; patches = [ @@ -46,15 +46,11 @@ stdenv.mkDerivation rec { ''; dontUseQmakeConfigure = true; - # hack around a build problem - preBuild = '' - mkdir -p ../tmp.*/lib - ''; nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; buildInputs = [ - poppler_utils libpng imagemagick libjpeg + poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils ] ++ (with python2Packages; [ apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow |