From c70943c332edc8f0bfebce0729b823c0061eac36 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Tue, 24 Aug 2004 11:26:26 +0000
Subject: [PATCH] Improved Ants in Nix. The names of the various Ants now
 reflects the j2sdk configuration: ant-j2sdk-1.4.2, ant-j2sdk-1.5.0,
 ant-blackdown

svn path=/nixpkgs/trunk/; revision=1325
---
 .../tools/build-managers/apache-ant/default.nix |  4 ++--
 pkgs/system/all-packages-generic.nix            | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index 35e92e130e2..37a5d35586e 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -1,9 +1,9 @@
-{stdenv, fetchurl, j2sdk}:
+{stdenv, fetchurl, j2sdk, name}:
 
 rec {
   body =
     stdenv.mkDerivation {
-      name = ant.realname;
+      name = name;
       builder = ./builder.sh;
       buildInputs = [ant j2sdk];
       inherit ant j2sdk;
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 8032e74a8a8..9e87d814505 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -407,12 +407,20 @@ rec {
 
   apacheant14 = (import ../development/tools/build-managers/apache-ant) {
     inherit fetchurl stdenv j2sdk;
+    name = "ant-j2sdk-1.4.2";
   };
 
-#  apacheant15 = (import ../development/tools/build-managers/apache-ant) {
-#    inherit fetchurl stdenv;
-#    j2sdk = j2sdk15;
-#  };
+  apacheantblackdown14 = (import ../development/tools/build-managers/apache-ant) {
+    inherit fetchurl stdenv;
+    j2sdk = blackdown;
+     name = "ant-blackdown-1.4.2";
+  };
+
+  apacheant15 = (import ../development/tools/build-managers/apache-ant) {
+    inherit fetchurl stdenv;
+    name = "ant-j2sdk-1.5.0";
+    j2sdk = j2sdk15;
+  };
 
   tomcat5 = (import ../servers/http/tomcat) {
     inherit fetchurl stdenv j2sdk;
@@ -623,7 +631,6 @@ rec {
     buildClientLibs = true;
   };
 
-
   ### OS-SPECIFIC
 
   kernelHeaders = (import ../os-specific/linux/kernel-headers) {