added ant-contrib, expression works but is really really ugly - maybe someone else can have a look at it?

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

pkgs/development/tools/build-managers/apache-ant/default.nix

@@ -1,16 +1,23 @@
-{stdenv, fetchurl, jdk, name}:
+{fetchurl, stdenv, jdk, name}:
 
 let {
   body =
     stdenv.mkDerivation {
       name = name;
+
       builder = ./builder.sh;
-      buildInputs = [ant jdk];
-      inherit ant jdk;
+      buildInputs = [antContrib jdk];
+
+      inherit antContrib jdk;
+
+      src = fetchurl {
+        url = http://apache.surfnet.nl/ant/binaries/apache-ant-1.6.5-bin.tar.bz2;
+        md5 = "26031ee1a2fd248ad0cc2e7f17c44c39";
+      };
     };
 
-  ant =
-    (import ./core-apache-ant.nix) {
+  antContrib =
+    (import ./ant-contrib.nix) {
       inherit fetchurl stdenv;
     };
 }