diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2007-11-11 07:54:45 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2007-11-11 07:54:45 +0000 |
commit | 61f4326752b238072fecfac164f7b9b1028f651d (patch) | |
tree | 496c9af9b89eefcdcb39c6e6aceab883cad1f2f3 /pkgs/applications/graphics/ImageMagick | |
parent | f38d6d0f1511c945daa181292e1f629aee467b80 (diff) | |
download | nixlib-61f4326752b238072fecfac164f7b9b1028f651d.tar nixlib-61f4326752b238072fecfac164f7b9b1028f651d.tar.gz nixlib-61f4326752b238072fecfac164f7b9b1028f651d.tar.bz2 nixlib-61f4326752b238072fecfac164f7b9b1028f651d.tar.lz nixlib-61f4326752b238072fecfac164f7b9b1028f651d.tar.xz nixlib-61f4326752b238072fecfac164f7b9b1028f651d.tar.zst nixlib-61f4326752b238072fecfac164f7b9b1028f651d.zip |
Added possibility to enable SVG in ImageMagick, updated pidgin-latex, added missed xorgserver xkb patch.
svn path=/nixpkgs/trunk/; revision=9623
Diffstat (limited to 'pkgs/applications/graphics/ImageMagick')
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 7ff19af6673a..0f814bd3829b 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,5 @@ -{stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript, -libjpeg, libpng, libtiff, libX11, libxml2, zlib}: -stdenv.mkDerivation { +args: with args; +(stdenv.mkDerivation ({ name = "ImageMagick-6.3.5"; src = fetchurl { @@ -9,8 +8,16 @@ stdenv.mkDerivation { }; configureFlags = " --with-dots --with-gs-font-dir="+ ghostscript + - "/share/ghostscript/fonts --with-gslib "; + "/share/ghostscript/fonts --with-gslib " +( + if args ? tetex then " --with-frozenpaths " else "" + ); buildInputs = [bzip2 freetype ghostscript graphviz libjpeg libpng - libtiff libX11 libxml2 zlib ]; -} + libtiff libX11 libxml2 zlib ] ++ (if args ? tetex then [args.tetex] else []) + ++ (if args ? librsvg then [args.librsvg] else []) + ; +} // (if args ? tetex then { + preConfigure = " + export DVIDecodeDelegate=${args.tetex}/bin/dvips + "; +} else {}))) |