diff options
author | kilianar <mail@kilianar.de> | 2022-10-07 12:20:43 +0200 |
---|---|---|
committer | kilianar <mail@kilianar.de> | 2022-10-07 12:20:43 +0200 |
commit | 9f6f358ac47b1ae1fdddb4a30be641dea346ccb5 (patch) | |
tree | e6c0090a651c27b8bc55ab7ea058b2d4c6a1fb17 /pkgs/applications/misc/calibre | |
parent | da6eaf2dbbecc92fb76f93e8197a0ff4c560fc04 (diff) |
calibre: 5.44.0 -> 6.6.1
https://github.com/kovidgoyal/calibre/releases/tag/v6.6.1
Diffstat (limited to 'pkgs/applications/misc/calibre')
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 63 |
1 files changed, 37 insertions, 26 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1d26881868e51..e573ee93d2130 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,37 +1,40 @@ { lib -, mkDerivation +, stdenv , fetchurl +, cmake , fetchpatch -, poppler_utils -, pkg-config -, libpng +, fontconfig +, hunspell +, hyphen +, icu , imagemagick , libjpeg -, fontconfig +, libmtp +, libpng +, libstemmer +, libuchardet +, libusb1 +, pkg-config , podofo -, qtbase +, poppler_utils +, python3Packages , qmake -, icu +, qtbase +, qtwayland +, removeReferencesTo , sqlite -, hunspell -, hyphen -, unrarSupport ? false -, python3Packages -, libusb1 -, libmtp +, wrapQtAppsHook , xdg-utils -, removeReferencesTo -, libstemmer -, wrapGAppsHook +, unrarSupport ? false }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "calibre"; - version = "5.44.0"; + version = "6.6.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-b/qj6v02okNV5ZV/D4ONttttNFbPoXy00Tn9lOuviOw="; + hash = "sha256-jJMHliPTRqiI4Wx5N9qbSryoARcGBisSq6awXIaTk5g="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -40,18 +43,18 @@ mkDerivation rec { (fetchpatch { name = "0001-only-plugin-update.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; - sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA="; + hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; }) (fetchpatch { name = "0006-Hardening-Qt-code.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0006-Hardening-Qt-code.patch"; - sha256 = "sha256-/X6iZZFxv4793h2yYI3UAz0mLNEmKpdVrmOnABFT0tE="; + hash = "sha256-CutVTb7K4tjewq1xAjHEGUHFcuuP/Z4FFtj4xQb4zKQ="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' - sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings\"]@g" \ + sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \ setup/build.py sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip.platform_tag}\"]/g" \ setup/build.py @@ -61,8 +64,15 @@ mkDerivation rec { ''; dontUseQmakeConfigure = true; + dontUseCmakeConfigure = true; - nativeBuildInputs = [ pkg-config qmake removeReferencesTo wrapGAppsHook ]; + nativeBuildInputs = [ + cmake + pkg-config + qmake + removeReferencesTo + wrapQtAppsHook + ]; buildInputs = [ fontconfig @@ -74,10 +84,12 @@ mkDerivation rec { libmtp libpng libstemmer + libuchardet libusb1 podofo poppler_utils qtbase + qtwayland sqlite xdg-utils ] ++ ( @@ -102,7 +114,7 @@ mkDerivation rec { pillow pychm pyqt-builder - pyqt5 + pyqt6 python regex sip @@ -166,8 +178,7 @@ mkDerivation rec { $out/lib/calibre/calibre/plugins/podofo.so for program in $out/bin/*; do - wrapProgram $program \ - ''${qtWrapperArgs[@]} \ + wrapQtApp $program \ --prefix PYTHONPATH : $PYTHONPATH \ --prefix PATH : ${poppler_utils.out}/bin done |