diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-18 19:48:12 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-18 19:48:12 +0100 |
| commit | 8af685d089071ff386474490862844641aaca2db (patch) | |
| tree | 0f237e2031f7e13c330ac5bd730de52fc24ce254 /pkgs/development/tools | |
| parent | c4910af8153a8ef888e2e8e71689ae0bec14acd4 (diff) | |
| parent | e5e633ca11b4145e7610231056f0cfe1157cb18d (diff) | |
| download | nixlib-8af685d089071ff386474490862844641aaca2db.tar nixlib-8af685d089071ff386474490862844641aaca2db.tar.gz nixlib-8af685d089071ff386474490862844641aaca2db.tar.bz2 nixlib-8af685d089071ff386474490862844641aaca2db.tar.lz nixlib-8af685d089071ff386474490862844641aaca2db.tar.xz nixlib-8af685d089071ff386474490862844641aaca2db.tar.zst nixlib-8af685d089071ff386474490862844641aaca2db.zip | |
Merge pull request #13097 from jerith666/antrun
ant: preserve antRun script
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/apache-ant/default.nix | 9 |
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 |