diff options
Diffstat (limited to 'pkgs/applications/misc/calibre/default.nix')
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 6ab83e29cc1..d86aee50bb9 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, icu, sqlite -, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp +, makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils }: stdenv.mkDerivation rec { - version = "2.46.0"; + version = "2.48.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0ig1pb62w57l6nhwg391mkjhw9dyicix6xigpdyw0320jdw9nlkb"; + sha256 = "0bjzw806czqxkhq9qqkhff8bhfc428pijkidb1h6gr47jqdp4hpg"; }; inherit python; - patchPhase = '' + patches = stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; + + prePatch = '' sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip':" \ setup/build_environment.py ''; @@ -53,7 +55,6 @@ stdenv.mkDerivation rec { for a in $out/bin/*; do wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \ - --prefix LD_LIBRARY_PATH : ${unrar}/lib \ --prefix PATH : ${poppler_utils}/bin done ''; @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Comprehensive e-book software"; homepage = http://calibre-ebook.com; - license = licenses.gpl3; + license = with licenses; if unrarSupport then unfreeRedistributable else gpl3; maintainers = with maintainers; [ viric iElectric pSub AndersonTorres ]; platforms = platforms.linux; inherit version; |