Merge pull request #44283 from kalbasit/nixpkgs-fix-44282

cups-filters: fix the build with poppler-0.67.0
This commit is contained in:
xeji 2018-08-01 10:25:53 +02:00 committed by GitHub
commit d7c34debe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 = [