mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-11 04:02:55 +03:00
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>
This commit is contained in:
parent
a5bc306985
commit
844b053cce
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user