diff options
Diffstat (limited to 'pkgs/applications/misc/calibre/default.nix')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 7b789b3881d..7c6f3cfdffb 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qtbase, icu, sqlite +, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite , makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils }: stdenv.mkDerivation rec { - version = "2.54.0"; + version = "2.55.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1r2cxnqiqnx51gbw283z8lz58i9zpvbf0a5ncrg5b2i9bphdiq79"; + sha256 = "12412d5vjp141xp5qvif50fskd1vsmr15h956z3bh6j99n8z5953"; }; inherit python; @@ -26,7 +26,14 @@ stdenv.mkDerivation rec { setup/build_environment.py ''; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + dontUseQmakeConfigure = true; + # hack around a build problem + preBuild = '' + mkdir -p ../tmp.*/lib + ln -s '${qtbase.out}/lib/libQt5PlatformSupport.a' ../tmp.*/lib/ + ''; + + nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; buildInputs = [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg |