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

ImageMagick: 6.8.7-5 & fix ghostscript/freetype errors

Browse Source 
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>
This commit is contained in:
Moritz Ulrich 2013-11-12 21:53:37 +01:00
parent a5bc306985
commit 844b053cce
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,8 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, pkgconfig
, bzip2 , bzip2
, fontconfig
, freetype , freetype
, ghostscript ? null , ghostscript ? null
, libjpeg , libjpeg
@ -16,14 +18,14 @@
}: }:
let let
version = "6.8.6-9"; version = "6.8.7-5";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ImageMagick-${version}"; name = "ImageMagick-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://imagemagick/${name}.tar.xz"; url = "mirror://imagemagick/${name}.tar.xz";
sha256 = "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg"; sha256 = "1cn1kg7scs6r7r00qlqirhnmqjnmyczbidab3vgqarw9qszh2ri6";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -42,17 +44,18 @@ stdenv.mkDerivation rec {
''; '';
propagatedBuildInputs = propagatedBuildInputs =
[ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg
libtool jasper libX11 libtool jasper libX11
] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript; ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript;
buildInputs = [ tetex ]; buildInputs = [ tetex pkgconfig ];
postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)'';
meta = { meta = with stdenv.lib; {
homepage = http://www.imagemagick.org/; homepage = http://www.imagemagick.org/;
description = "A software suite to create, edit, compose, or convert bitmap images"; 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 ];
}; };
} }