diff options
author | pacien <pacien.trangirard@pacien.net> | 2019-01-25 22:43:58 +0100 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-02-06 15:55:47 -0500 |
commit | 87d8ba0ae62a4c121df4b1abd8590856b23c76fd (patch) | |
tree | 67a95e26ec61e5f0ddb40730b4bfca494a04041f | |
parent | 1c10f5e395a58c4fc76092c77cdf02903fa16e34 (diff) | |
download | nixlib-87d8ba0ae62a4c121df4b1abd8590856b23c76fd.tar nixlib-87d8ba0ae62a4c121df4b1abd8590856b23c76fd.tar.gz nixlib-87d8ba0ae62a4c121df4b1abd8590856b23c76fd.tar.bz2 nixlib-87d8ba0ae62a4c121df4b1abd8590856b23c76fd.tar.lz nixlib-87d8ba0ae62a4c121df4b1abd8590856b23c76fd.tar.xz nixlib-87d8ba0ae62a4c121df4b1abd8590856b23c76fd.tar.zst nixlib-87d8ba0ae62a4c121df4b1abd8590856b23c76fd.zip |
imagemagick: add djvu support
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 669c7c8f9612..efbf5864faa8 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkgconfig, libtool -, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg +, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif + libpng libtiff libxml2 libheif djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 79149dc83cf8..b3a1b64cae96 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool -, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg +, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif libde265 + libpng libtiff libxml2 libheif libde265 djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b61ad101db0..ea6131d99d73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17703,6 +17703,7 @@ in freetype = null; ghostscript = null; libjpeg = null; + djvulibre = null; lcms2 = null; openexr = null; libpng = null; @@ -17732,6 +17733,7 @@ in freetype = null; ghostscript = null; libjpeg = null; + djvulibre = null; lcms2 = null; openexr = null; libpng = null; |