diff options
Diffstat (limited to 'pkgs/build-support/release/ant-build.nix')
-rw-r--r-- | pkgs/build-support/release/ant-build.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index fe15f93a8fe2..0cabdf2f7e79 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -8,8 +8,8 @@ , antProperties ? [] , antBuildInputs ? [] , buildfile ? "build.xml" -, ant ? pkgs.ant -, jre ? pkgs.jre +, ant ? pkgs.apacheAntOpenJDK +, jre ? pkgs.openjdk , hydraAntLogger ? pkgs.hydraAntLogger , ... } @ args: @@ -100,15 +100,10 @@ stdenv.mkDerivation ( postHook = '' mkdir -p $out/nix-support echo "$system" > $out/nix-support/system + . ${./functions.sh} - # If `src' is the result of a call to `makeSourceTarball', then it - # has a subdirectory containing the actual tarball(s). If there are - # multiple tarballs, just pick the first one. origSrc=$src - if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) - fi - + src=$(findTarballs $src | head -1) ''; } ) |