From 3f371bfacfe141c38636d64eb9b111b54e6279e4 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Mon, 9 Aug 2004 21:28:26 +0000
Subject: [PATCH] Improved Ant

svn path=/nixpkgs/trunk/; revision=1254
---
 pkgs/development/tools/build-managers/apache-ant/builder.sh   | 1 +
 .../tools/build-managers/apache-ant/core-builder.sh           | 4 ++--
 pkgs/development/tools/build-managers/apache-ant/default.nix  | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-ant/builder.sh b/pkgs/development/tools/build-managers/apache-ant/builder.sh
index 9be3012ec6f..6a35394749e 100644
--- a/pkgs/development/tools/build-managers/apache-ant/builder.sh
+++ b/pkgs/development/tools/build-managers/apache-ant/builder.sh
@@ -9,6 +9,7 @@ export JAVA_HOME=$j2sdk
 export JAVACMD=$j2sdk/bin/java
 export ANT_OPTS=""
 export ANT_ARGS=""
+export LANG="en_US"
 
 $ant/bin/core-ant \$@
 EOF
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
index afa6a259f7e..d7fffdabf00 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
+++ b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
@@ -24,6 +24,7 @@ rm $out/bin/* || exit 1
 cat >> $out/bin/core-ant <<EOF
 #! /bin/sh
 
+
 # Variables:
 #   JAVA_HOME
 #   JAVACMD
@@ -39,8 +40,7 @@ else
 fi
 
 if [ -n "\$JIKESPATH" ]; then
-  exec "\$JAVACMD" \$ANT_OPTS -classpath "\$LOCALCLASSPATH" -Dant.home="\${ANT_HOME}" -Djikes.class.path="\$JIKESPATH" org.apache.tools.ant.launch.Launcher \$ANT_ARGS -l
-ib "$CLASSPATH" "\$@"
+  exec "\$JAVACMD" \$ANT_OPTS -classpath "\$LOCALCLASSPATH" -Dant.home="\${ANT_HOME}" -Djikes.class.path="\$JIKESPATH" org.apache.tools.ant.launch.Launcher \$ANT_ARGS -lib "$CLASSPATH" "\$@"
 else
   exec "\$JAVACMD" \$ANT_OPTS -classpath "\$LOCALCLASSPATH" -Dant.home="\${ANT_HOME}" org.apache.tools.ant.launch.Launcher \$ANT_ARGS -lib "$CLASSPATH" "\$@"
   fi
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index bd6618e7024..35e92e130e2 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -1,13 +1,12 @@
 {stdenv, fetchurl, j2sdk}:
 
 rec {
-
   body =
     stdenv.mkDerivation {
       name = ant.realname;
       builder = ./builder.sh;
-      inherit ant j2sdk;
       buildInputs = [ant j2sdk];
+      inherit ant j2sdk;
     };
 
   ant =