From 01e9dfb44988ca0d205582e914c4249abb4253de Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 2 Apr 2015 06:58:09 -0500
Subject: [PATCH] cups-filters: fix build with latest poppler

---
 pkgs/misc/cups/filters.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 524662a0ee6..099bf9f6d0c 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -10,6 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./longer-shell-path.patch;
+      bash = "${bash}/bin/bash";
+    })
+
+    # Fix build with poppler-0.31.0
+    (fetchurl {
+      url = "https://bugs.linuxfoundation.org/attachment.cgi?id=476";
+      name = "cups-filters-poppler-0.31.0.patch";
+      sha256 = "016pzksz4nl1sv3p5ahlnbmb7c899yrvlzq8jxic0gvdrzwd5bl4";
+    })
+  ];
+
   buildInputs = [
     pkgconfig cups poppler fontconfig libjpeg libpng perl
     ijs qpdf dbus
@@ -34,13 +48,6 @@ stdenv.mkDerivation rec {
       substituteInPlace filter/gstoraster.c --replace execve execvpe
     '';
 
-  patches = [
-    (substituteAll {
-      src = ./longer-shell-path.patch;
-      bash = "${bash}/bin/bash";
-    })
-  ];
-
   postInstall =
     ''
       for i in $out/lib/cups/filter/{pstopdf,texttops,imagetops}; do