Updated ImageMagick

svn path=/nixpkgs/trunk/; revision=10886
This commit is contained in:
Michael Raskin 2008-02-28 18:53:39 +00:00
parent dcddcf0d87
commit 5883330e2c
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,26 @@
args: with args;
stdenv.mkDerivation (rec {
name = "ImageMagick-${version}";
src = fetchurl {
url = "ftp://ftp.imagemagick.org/pub/ImageMagick/${name}.tar.bz2";
sha256 = "0ynn8gxixjb16xhg60hp2sbfymh03y5qxxgffwlchciiylw9dlvd";
};
configureFlags = " --with-dots --with-gs-font-dir="+ ghostscript +
"/share/ghostscript/fonts --with-gslib " +(
if args ? tetex then " --with-frozenpaths " else ""
);
buildInputs = [bzip2 freetype ghostscript graphviz libjpeg libpng
libtiff libX11 libxml2 zlib libtool] ++ (if args ? tetex then [args.tetex] else [])
++ (if args ? librsvg then [args.librsvg] else []);
meta = {
homepage = http://www.imagemagick.org;
};
} // (if args ? tetex then {
preConfigure = "
export DVIDecodeDelegate=${args.tetex}/bin/dvips
";
} else {}))

View File

@ -4912,7 +4912,7 @@ rec {
inherit (xlibs) libX11 libXft libXext libXinerama libXrandr;
};
imagemagickFun = lib.sumArgs (selectVersion ../applications/graphics/ImageMagick "6.3.8-5" ) {
imagemagickFun = lib.sumArgs (selectVersion ../applications/graphics/ImageMagick "6.3.9-0" ) {
inherit stdenv fetchurl libtool;
};