diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-09 13:06:51 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-09 13:06:51 +0100 |
| commit | 113265b6d3e160430d22529867ca68c6804f0873 (patch) | |
| tree | 92f96a9502748d24117f9e1780461b6b84310f1e /pkgs/top-level | |
| parent | 16e626a80dd98f10622c6004415efdf2658a298c (diff) | |
| download | nixlib-113265b6d3e160430d22529867ca68c6804f0873.tar nixlib-113265b6d3e160430d22529867ca68c6804f0873.tar.gz nixlib-113265b6d3e160430d22529867ca68c6804f0873.tar.bz2 nixlib-113265b6d3e160430d22529867ca68c6804f0873.tar.lz nixlib-113265b6d3e160430d22529867ca68c6804f0873.tar.xz nixlib-113265b6d3e160430d22529867ca68c6804f0873.tar.zst nixlib-113265b6d3e160430d22529867ca68c6804f0873.zip | |
apacheAntGcj: Remove
No need to keep two different versions of Ant around. The default Ant works fine with GCJ (and doesn't pull in OpenJDK).
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c038b38acf7a..0f0bf7ea1b99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3444,11 +3444,6 @@ let apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - 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 - }; - astyle = callPackage ../development/tools/misc/astyle { }; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -5558,7 +5553,6 @@ let redland = pkgs.librdf_redland; rhino = callPackage ../development/libraries/java/rhino { - ant = apacheAntGcj; javac = gcj; jvm = gcj; }; |