summary refs log tree commit diff
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-08-01 10:25:53 +0200
committerGitHub <noreply@github.com>2018-08-01 10:25:53 +0200
commitd7c34debe2d5703f3233468e408480e7430e25e3 (patch)
tree4500fe2e9dd95110824e1cc8d2dc7347670be6d9
parent02ba14dbd2e08bbd5f065fd9cc0e47028d946a9f (diff)
parent347ff3238a44646deba75560344bea0ae03e3990 (diff)
downloadnixlib-d7c34debe2d5703f3233468e408480e7430e25e3.tar
nixlib-d7c34debe2d5703f3233468e408480e7430e25e3.tar.gz
nixlib-d7c34debe2d5703f3233468e408480e7430e25e3.tar.bz2
nixlib-d7c34debe2d5703f3233468e408480e7430e25e3.tar.lz
nixlib-d7c34debe2d5703f3233468e408480e7430e25e3.tar.xz
nixlib-d7c34debe2d5703f3233468e408480e7430e25e3.tar.zst
nixlib-d7c34debe2d5703f3233468e408480e7430e25e3.zip
Merge pull request #44283 from kalbasit/nixpkgs-fix-44282
cups-filters: fix the build with poppler-0.67.0
-rw-r--r--pkgs/misc/cups/filters.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 870d9f5c1607..bc4fec959263 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -2,6 +2,7 @@
 , libjpeg, libpng, perl, ijs, qpdf, dbus, avahi
 , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript
 , mupdf
+, fetchpatch
 }:
 
 let
@@ -16,6 +17,16 @@ in stdenv.mkDerivation rec {
     sha256 = "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k";
   };
 
+  patches = [
+    # This patch fixes cups-filters when compiled with poppler-0.67.0.
+    # Issue: https://github.com/OpenPrinting/cups-filters/pull/50
+    # PR: https://github.com/OpenPrinting/cups-filters/pull/51
+    (fetchpatch {
+      url = "https://github.com/OpenPrinting/cups-filters/commit/219de01c61f3b1ec146abf142d0dfc8c560cc58e.patch";
+      sha256 = "0f0lql3rbm2g8mxrpigfyi8fb4i2g4av20g417jzdilp60jq0ny8";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig makeWrapper ];
 
   buildInputs = [