summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorMatt McHenry <github@matt.mchenryfamily.org>2016-02-18 09:57:15 -0500
committerMatt McHenry <github@matt.mchenryfamily.org>2016-02-18 10:13:39 -0500
commite5e633ca11b4145e7610231056f0cfe1157cb18d (patch)
treec4ebfadc986cd1b630812cd7e56fe5b0a13128aa /pkgs/development/tools
parent77f8f35d57618c1ba456d968524f2fb2c3448295 (diff)
downloadnixlib-e5e633ca11b4145e7610231056f0cfe1157cb18d.tar
nixlib-e5e633ca11b4145e7610231056f0cfe1157cb18d.tar.gz
nixlib-e5e633ca11b4145e7610231056f0cfe1157cb18d.tar.bz2
nixlib-e5e633ca11b4145e7610231056f0cfe1157cb18d.tar.lz
nixlib-e5e633ca11b4145e7610231056f0cfe1157cb18d.tar.xz
nixlib-e5e633ca11b4145e7610231056f0cfe1157cb18d.tar.zst
nixlib-e5e633ca11b4145e7610231056f0cfe1157cb18d.zip
ant: preserve antRun script
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/build-managers/apache-ant/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index b15c9065e0ec..8816a005ca0f 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -23,9 +23,14 @@ stdenv.mkDerivation {
       mv * $out/lib/ant/
 
       # Get rid of the manual (35 MiB).  Maybe we should put this in a
-      # separate output.  Also get rid of the Ant scripts since we
-      # provide our own.
+      # separate output.  Keep the antRun script since it's vanilla sh
+      # and needed for the <exec/> task (but since we set ANT_HOME to
+      # a weird value, we have to move antRun to a weird location).
+      # Get rid of the other Ant scripts since we provide our own.
+      mv $out/lib/ant/bin/antRun $out/bin/
       rm -rf $out/lib/ant/{manual,bin,WHATSNEW}
+      mkdir $out/lib/ant/bin
+      mv $out/bin/antRun $out/lib/ant/bin/
 
       # Install ant-contrib.
       unpackFile $contrib