Unverified Commit 1d2980b5 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #206580 from gador/calibre-fix-fileopen

parents 06f46ec7 889395b1
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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