gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'calibre-fix-fileopen' into current

Browse Source
This commit is contained in:
Florian Brandes
2022-12-17 19:21:37 +01:00
parent 7860a7f6a1 283f5951f7
commit f2ddc2a1a2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/calibre/default.nix
View File

@@ -25,6 +25,7 @@
, sqlite , sqlite
, wrapQtAppsHook , wrapQtAppsHook
, xdg-utils , xdg-utils
, wrapGAppsHook
, unrarSupport ? false , unrarSupport ? false
}: }:
@@ -71,7 +72,7 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
qmake qmake
removeReferencesTo removeReferencesTo
wrapQtAppsHook wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
@@ -169,6 +170,7 @@ stdenv.mkDerivation rec {
# Wrap manually # Wrap manually
dontWrapQtApps = true; dontWrapQtApps = true;
dontWrapGApps = true;
# Remove some references to shrink the closure size. This reference (as of # Remove some references to shrink the closure size. This reference (as of
# 2018-11-06) was a single string like the following: # 2018-11-06) was a single string like the following:
@@ -178,7 +180,9 @@ stdenv.mkDerivation rec {
$out/lib/calibre/calibre/plugins/podofo.so $out/lib/calibre/calibre/plugins/podofo.so
for program in $out/bin/*; do for program in $out/bin/*; do
wrapQtApp $program \ wrapProgram $program \
''${qtWrapperArgs[@]} \
''${gappsWrapperArgs[@]} \
--prefix PYTHONPATH : $PYTHONPATH \ --prefix PYTHONPATH : $PYTHONPATH \
--prefix PATH : ${poppler_utils.out}/bin --prefix PATH : ${poppler_utils.out}/bin
done done