diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-03 13:29:06 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-03 13:29:06 +0100 |
| commit | 54d172141435d61813666ccb6dbfe8a58a9ce896 (patch) | |
| tree | 26973f0d8b77f1e50687d25badeca32c79927ce6 /pkgs/top-level | |
| parent | e1f7144aa8fbc9a99463b82af5c9562e4b7596e0 (diff) | |
| download | nixlib-54d172141435d61813666ccb6dbfe8a58a9ce896.tar nixlib-54d172141435d61813666ccb6dbfe8a58a9ce896.tar.gz nixlib-54d172141435d61813666ccb6dbfe8a58a9ce896.tar.bz2 nixlib-54d172141435d61813666ccb6dbfe8a58a9ce896.tar.lz nixlib-54d172141435d61813666ccb6dbfe8a58a9ce896.tar.xz nixlib-54d172141435d61813666ccb6dbfe8a58a9ce896.tar.zst nixlib-54d172141435d61813666ccb6dbfe8a58a9ce896.zip | |
ant: Update to 1.9.3
Also, Ant no longer has a build-time dependency on a particular JDK. It finds the JDK via $JAVA_HOME or $PATH (by looking up javac). This way, we don't need to have separate packages like apacheAntOpenJDK and apacheAntOracleJDK. It also seems reasonable: after all, installing GNU Make doesn't give you a C compiler either. It does mean that instead of buildInputs = [ ant ]; you now need to write something like buildInputs = [ ant jdk ];
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3683fecc109..7e9fa85e39fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2827,10 +2827,9 @@ let callPackage ../development/compilers/openjdk-darwin { } else let - openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {}; + openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { }; in callPackage ../development/compilers/openjdk { jdk = openjdkBootstrap; - ant = pkgs.ant.override { jdk = openjdkBootstrap; }; }; openjre = pkgs.openjdk.jre; @@ -3457,9 +3456,6 @@ let apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - apacheAntOpenJDK = apacheAnt.override { jdk = openjdk; }; - apacheAntOracleJDK = ant.override { jdk = pkgs.oraclejdk; }; - apacheAntGcj = callPackage ../development/tools/build-managers/apache-ant/from-source.nix { # must be either pre-built or built with GCJ *alone* gcj = gcj.gcc; # use the raw GCJ, which has ${gcj}/lib/jvm |