* ImageMagick: code cleanup and added another source URL

  (ftp.imagemagick.org seems to be down now).

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

1 files changed, 23 insertions, 13 deletions

diff --git a/pkgs/applications/graphics/ImageMagick/6.3.9-0.nix b/pkgs/applications/graphics/ImageMagick/6.3.9-0.nix
index 17632f3c46ac..ad7899b33c49 100644
--- a/pkgs/applications/graphics/ImageMagick/6.3.9-0.nix
+++ b/pkgs/applications/graphics/ImageMagick/6.3.9-0.nix
@@ -1,26 +1,36 @@
 args: with args;
+
 stdenv.mkDerivation (rec {
   name = "ImageMagick-${version}";
 
   src = fetchurl {
-    url = "ftp://ftp.imagemagick.org/pub/ImageMagick/${name}.tar.bz2";
+    urls = [
+      "ftp://ftp.imagemagick.org/pub/ImageMagick/${name}.tar.bz2"
+      "http://ftp.surfnet.nl/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 ""
-		);
+  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
+    ]
+    ++ stdenv.lib.optional (args ? tetex) args.tetex
+    ++ stdenv.lib.optional (args ? librsvg) args.librsvg;
 
-  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 []);
+  preConfigure = if args ? tetex then
+    ''
+      export DVIDecodeDelegate=${args.tetex}/bin/dvips
+    '' else "";
 
   meta = {
     homepage = http://www.imagemagick.org;
   };
-} // (if args ? tetex then {
-	preConfigure = "
-		export DVIDecodeDelegate=${args.tetex}/bin/dvips
-	";
-} else {}))
+})