* Clean up the Ant name, e.g. "ant-openjdk-1.8.0RC1" instead of

  "ant-<JDK name>".
* Remove openjdkDarwin/ecjDarwin/antDarwin attributes.  Instead
  the openjdk attribute refers to the Darwin package on Darwin.

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

1 files changed, 20 insertions, 17 deletions

diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index 47a916f48e2bd..bec71a291d6d1 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -1,23 +1,26 @@
-{fetchurl, stdenv, jdk, name}:
+{ fetchurl, stdenv, jdk }:
 
-let {
-  body =
-    stdenv.mkDerivation {
-      name = name;
+let
 
-      builder = ./builder.sh;
-      buildInputs = [antContrib jdk];
+  antContrib = import ./ant-contrib.nix {
+    inherit fetchurl stdenv;
+  };
 
-      inherit antContrib jdk;
+  version = "1.8.0RC1";
 
-      src = fetchurl {
-        url = http://apache.mirror.transip.nl/ant/binaries/apache-ant-1.8.0RC1-bin.tar.bz2 ;
-        sha256 = "0xvmrsghibq7p3wvfkmvmkkg0zzfmw32lrfjl5f6cfzchjjnw9wx";
-      };
-    };
+in
 
-  antContrib =
-    (import ./ant-contrib.nix) {
-      inherit fetchurl stdenv;
-    };
+stdenv.mkDerivation {
+  name = "ant-${(builtins.parseDrvName jdk.name).name}-${version}";
+
+  builder = ./builder.sh;
+  
+  buildInputs = [ antContrib jdk ];
+
+  inherit antContrib jdk;
+
+  src = fetchurl {
+    url = "http://apache.mirror.transip.nl/ant/binaries/apache-ant-${version}-bin.tar.bz2";
+    sha256 = "0xvmrsghibq7p3wvfkmvmkkg0zzfmw32lrfjl5f6cfzchjjnw9wx";
+  };
 }