diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/calibre/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/calibre/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix index 1d6af843e2fd..b3754fed1796 100644 --- a/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -23,15 +23,16 @@ , xdg-utils , removeReferencesTo , libstemmer +, wrapGAppsHook }: mkDerivation rec { pname = "calibre"; - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-1NQB7vrcU0hR308/8keUn/rHhdvJk5Ab0pOMPyiU1+M="; + hash = "sha256-x2u4v0k05WMATSsuo76NnqChIz8BcTuZfPkZa0uLnMY="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -62,7 +63,7 @@ mkDerivation rec { dontUseQmakeConfigure = true; - nativeBuildInputs = [ pkg-config qmake removeReferencesTo ]; + nativeBuildInputs = [ pkg-config qmake removeReferencesTo wrapGAppsHook ]; buildInputs = [ chmlib @@ -95,7 +96,6 @@ mkDerivation rec { feedparser html2text html5-parser - jeepney lxml markdown mechanize @@ -154,7 +154,6 @@ mkDerivation rec { # Wrap manually dontWrapQtApps = true; - dontWrapGApps = true; # Remove some references to shrink the closure size. This reference (as of # 2018-11-06) was a single string like the following: @@ -166,7 +165,6 @@ mkDerivation rec { for program in $out/bin/*; do wrapProgram $program \ ''${qtWrapperArgs[@]} \ - ''${gappsWrapperArgs[@]} \ --prefix PYTHONPATH : $PYTHONPATH \ --prefix PATH : ${poppler_utils.out}/bin done |