From 8e2ba28fe1154da93e2f5ab5dbced37ae23a92da Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Tue, 25 Oct 2005 17:57:36 +0000
Subject: Accept NIX_ANT_OPTS

svn path=/nixpkgs/trunk/; revision=4132
---
 pkgs/development/tools/build-managers/apache-ant/core-builder.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development/tools/build-managers/apache-ant')

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 e06c6a2d2ca8..612a11202d53 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
+++ b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
@@ -28,7 +28,7 @@ cat >> $out/bin/core-ant <<EOF
 # Variables:
 #   JAVA_HOME
 #   JAVACMD
-#   ANT_OPTS
+#   ANT_OPTS, NIX_ANT_OPTS
 #   ANT_ARGS
 
 ANT_HOME=$out
@@ -40,9 +40,9 @@ 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 -lib "$CLASSPATH" "\$@"
+  exec "\$JAVACMD" \$NIX_ANT_OPTS \$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" "\$@"
+  exec "\$JAVACMD" \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" -Dant.home="\${ANT_HOME}" org.apache.tools.ant.launch.Launcher \$ANT_ARGS -lib "$CLASSPATH" "\$@"
   fi
 fi
 EOF
-- 
cgit 1.4.1