Added possibility to enable SVG in ImageMagick, updated pidgin-latex, added missed xorgserver xkb patch.

svn path=/nixpkgs/trunk/; revision=9623

1 files changed, 13 insertions, 6 deletions

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 7ff19af6673..0f814bd3829 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 {})))