Merge branch 'staging-next' into staging

2021-05-14 01:40:09 +02:00
parent 882b692c4f 39e3f7c2cc
commit ac6a4f7cf5
46 changed files with 274 additions and 121 deletions
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, fetchpatch
 , autoreconfHook
 , gettext
 , libtool
@@ -25,6 +26,15 @@ stdenv.mkDerivation rec {
    sha256 = "1igabfy3fd7qndihmkfk9incc15pjxpxh2cn5pfw5fxfwrpjrarn";
  };

+  patches = [
+    # Not included in 0.9.17.1, but will be in the next version.
+    (fetchpatch {
+      name = "no-poppler-splash.patch";
+      url = "https://github.com/jwilk/pdf2djvu/commit/2ec7eee57a47bbfd296badaa03dc20bf71b50201.patch";
+      sha256 = "03kap7k2j29r16qgl781cxpswzg3r2yn513cqycgl0vax2xj3gly";
+    })
+  ];
+
  nativeBuildInputs = [ autoreconfHook pkg-config ];

  buildInputs = [