From 889395b1588c53f025d72bd97965f42ee4c86a1f Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 17 Dec 2022 18:58:44 +0100 Subject: [PATCH] calibre: Fix File Open Dialog add wrapGAppsHook (back) to include gsettings. Without, calibre dumps core because of missing gsettings. Signed-off-by: Florian Brandes --- pkgs/applications/misc/calibre/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 2074addb1b21..f9a1faaf036d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -25,6 +25,7 @@ , sqlite , wrapQtAppsHook , xdg-utils +, wrapGAppsHook , unrarSupport ? false }: @@ -71,6 +72,7 @@ stdenv.mkDerivation rec { pkg-config qmake removeReferencesTo + wrapGAppsHook wrapQtAppsHook ]; @@ -169,6 +171,7 @@ stdenv.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: @@ -178,7 +181,9 @@ stdenv.mkDerivation rec { $out/lib/calibre/calibre/plugins/podofo.so for program in $out/bin/*; do - wrapQtApp $program \ + wrapProgram $program \ + ''${qtWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} \ --prefix PYTHONPATH : $PYTHONPATH \ --prefix PATH : ${poppler_utils.out}/bin done