From b8e0cb3fe74f08f2431877a0789262d6afdf1718 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 28 Mar 2016 23:09:19 +0000
Subject: [PATCH] jbig2enc: fix merge

---
 pkgs/tools/graphics/jbig2enc/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix
index 62c29a6192f..0bb0bb00efa 100644
--- a/pkgs/tools/graphics/jbig2enc/default.nix
+++ b/pkgs/tools/graphics/jbig2enc/default.nix
@@ -8,13 +8,6 @@ stdenv.mkDerivation {
     sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/agl/jbig2enc/commit/53ce5fe7e73d7ed95c9e12b52dd4984723f865fa.diff";
-      sha256 = "0n6s24i1fy9xspawns3r0kmx2fl0q3wqp68l1yai36jhfw08i3n4";
-    })
-  ];
-
   propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ];
 
   patches = [