diff options
author | Moritz Ulrich <moritz@tarn-vedra.de> | 2013-11-12 21:53:37 +0100 |
---|---|---|
committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2013-11-12 21:53:37 +0100 |
commit | 844b053cce172c9cd4cc60b640c83490aea7c47b (patch) | |
tree | 042c0330802b9af0847d837f0f66ba7e71e2ad35 /pkgs | |
parent | a5bc30698554a01814a2db4f52f3d4075a0a9632 (diff) | |
download | nixpkgs-844b053cce172c9cd4cc60b640c83490aea7c47b.tar nixpkgs-844b053cce172c9cd4cc60b640c83490aea7c47b.tar.gz nixpkgs-844b053cce172c9cd4cc60b640c83490aea7c47b.tar.bz2 nixpkgs-844b053cce172c9cd4cc60b640c83490aea7c47b.tar.lz nixpkgs-844b053cce172c9cd4cc60b640c83490aea7c47b.tar.xz nixpkgs-844b053cce172c9cd4cc60b640c83490aea7c47b.tar.zst nixpkgs-844b053cce172c9cd4cc60b640c83490aea7c47b.zip |
ImageMagick: 6.8.7-5 & fix ghostscript/freetype errors
ghostscript and freetype were enabled but the configure script couldn't find them. It turns out it uses pkgconfig to search for them. Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c2a661c82fd..0a6aed814ae 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,8 @@ { stdenv , fetchurl +, pkgconfig , bzip2 +, fontconfig , freetype , ghostscript ? null , libjpeg @@ -16,14 +18,14 @@ }: let - version = "6.8.6-9"; + version = "6.8.7-5"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg"; + sha256 = "1cn1kg7scs6r7r00qlqirhnmqjnmyczbidab3vgqarw9qszh2ri6"; }; enableParallelBuilding = true; @@ -42,17 +44,18 @@ stdenv.mkDerivation rec { ''; propagatedBuildInputs = - [ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg + [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg libtool jasper libX11 ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript; - buildInputs = [ tetex ]; + buildInputs = [ tetex pkgconfig ]; postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; - meta = { + meta = with stdenv.lib; { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ the-kenny ]; }; } |