From e86a4a1112e88f62f2a0960bbf3971cbdd527d18 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Sat, 10 Jul 2004 16:17:48 +0000
Subject: [PATCH] Added the Ant wrapper. The ant script in this wrapper sets
 the config in environment variables and invokes core-ant.

svn path=/nixpkgs/trunk/; revision=1149
---
 .../tools/build-managers/apache-ant/builder.sh  | 16 ++++++++++++++++
 .../apache-ant/core-apache-ant.nix              |  4 +++-
 .../tools/build-managers/apache-ant/default.nix | 17 +++++++++++++++++
 pkgs/system/all-packages-generic.nix            |  3 ++-
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/apache-ant/builder.sh
 create mode 100644 pkgs/development/tools/build-managers/apache-ant/default.nix

diff --git a/pkgs/development/tools/build-managers/apache-ant/builder.sh b/pkgs/development/tools/build-managers/apache-ant/builder.sh
new file mode 100644
index 000000000000..f614f7d437c1
--- /dev/null
+++ b/pkgs/development/tools/build-managers/apache-ant/builder.sh
@@ -0,0 +1,16 @@
+. $stdenv/setup || exit 1
+
+mkdir -p $out/bin || exit 1
+
+cat >> $out/bin/ant <<EOF
+#! /bin/sh
+
+export JAVA_HOME=$j2sdk
+export JAVACMD=$j2sdk/bin/java
+export ANT_OPTS=""
+export ANT_ARGS=""
+
+$ant/bin/core-ant
+EOF
+
+chmod a+x $out/bin/ant || exit 1
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
index 1a6af33114da..070cc4071ad3 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
@@ -1,7 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "apache-ant-1.6.1";
+  name = "core-apache-ant-1.6.1";
+  realname = "apache-ant-1.6.1";
+
   builder = ./core-builder.sh;
   src = fetchurl {
     url = http://www.apache.org/dist/ant/binaries/apache-ant-1.6.1-bin.tar.bz2;
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
new file mode 100644
index 000000000000..bd6618e70242
--- /dev/null
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, j2sdk}:
+
+rec {
+
+  body =
+    stdenv.mkDerivation {
+      name = ant.realname;
+      builder = ./builder.sh;
+      inherit ant j2sdk;
+      buildInputs = [ant j2sdk];
+    };
+
+  ant =
+    (import ./core-apache-ant.nix) {
+      inherit fetchurl stdenv;
+    };
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 1a2e06efb5e9..34939333b8df 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -306,8 +306,9 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  apacheant = (import ../development/tools/build-managers/apache-ant/core-apache-ant.nix) {
+  apacheant = (import ../development/tools/build-managers/apache-ant) {
     inherit fetchurl stdenv;
+    j2sdk = j2sdk15;
   };
 
   pcre = (import ../development/libraries/pcre) {