diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-05-03 13:19:15 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-05-03 13:19:41 +0300 |
| commit | fe0bb1efd13b75eeb0785840d88c2280562d5f69 (patch) | |
| tree | d9b5dabce33fb96aeb06cc9488a7e8d04c8a7b9c /pkgs | |
| parent | 2ef7fbe4a0025a25005ada1b6435a6ec2659df16 (diff) | |
| download | nixlib-fe0bb1efd13b75eeb0785840d88c2280562d5f69.tar nixlib-fe0bb1efd13b75eeb0785840d88c2280562d5f69.tar.gz nixlib-fe0bb1efd13b75eeb0785840d88c2280562d5f69.tar.bz2 nixlib-fe0bb1efd13b75eeb0785840d88c2280562d5f69.tar.lz nixlib-fe0bb1efd13b75eeb0785840d88c2280562d5f69.tar.xz nixlib-fe0bb1efd13b75eeb0785840d88c2280562d5f69.tar.zst nixlib-fe0bb1efd13b75eeb0785840d88c2280562d5f69.zip | |
imagemagick: add webp support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index b732a2ed9167..78837f55af4c 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, openjpeg +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp }: let @@ -39,13 +39,14 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg - openexr libpng librsvg libtiff libxml2 openjpeg + openexr libpng librsvg libtiff libxml2 openjpeg libwebp ]; propagatedBuildInputs = [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ]; postInstall = '' + (cd "$out/include" && ln -s ImageMagick* ImageMagick) '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb067817f548..a74438448f8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12871,6 +12871,7 @@ in libtiff = null; libxml2 = null; openjpeg = null; + libwebp = null; }; imagemagick = self.imagemagickBig.override { |