From 929b0d99c1848ae4491aec0620c1fe252bf2fbd0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Apr 2016 19:32:08 +0300
Subject: [PATCH] imagemagick: support JPEG2000

---
 pkgs/applications/graphics/ImageMagick/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index ef3b7b05b18..b732a2ed916 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, pkgconfig, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
-, lcms2, openexr, libpng, librsvg, libtiff, libxml2
+, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg
 }:
 
 let
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg
-      openexr libpng librsvg libtiff libxml2
+      openexr libpng librsvg libtiff libxml2 openjpeg
     ];
 
   propagatedBuildInputs =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cd3c72e89f..0daa3d2b13c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12814,6 +12814,7 @@ in
     librsvg = null;
     libtiff = null;
     libxml2 = null;
+    openjpeg = null;
   };
 
   imagemagick = self.imagemagickBig.override {