public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imagemagick: add webp support

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-05-03 13:19:15 +03:00
parent 2ef7fbe4a0
commit fe0bb1efd1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkgconfig, libtool { lib, stdenv, fetchurl, pkgconfig, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , 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 let
@ -39,13 +39,14 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg
openexr libpng librsvg libtiff libxml2 openjpeg openexr libpng librsvg libtiff libxml2 openjpeg libwebp
]; ];
propagatedBuildInputs = propagatedBuildInputs =
[ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ]; [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ];
postInstall = '' postInstall = ''
(cd "$out/include" && ln -s ImageMagick* ImageMagick) (cd "$out/include" && ln -s ImageMagick* ImageMagick)
'' + lib.optionalString (ghostscript != null) '' '' + lib.optionalString (ghostscript != null) ''
for la in $out/lib/*.la; do for la in $out/lib/*.la; do

1
pkgs/top-level/all-packages.nix
View File

@ -12871,6 +12871,7 @@ in
libtiff = null; libtiff = null;
libxml2 = null; libxml2 = null;
openjpeg = null; openjpeg = null;
libwebp = null;
}; };
imagemagick = self.imagemagickBig.override { imagemagick = self.imagemagickBig.override {