diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-05-26 14:53:13 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-05-26 14:53:13 +0000 |
| commit | c228b1a957c31dfa89d52ea0aa31eca0b58ba41d (patch) | |
| tree | 523bbf7aa5b5efd4163c9bed78a01bba326f9bf3 | |
| parent | b62acd088e0aaf5e5de80572412ff856873586f5 (diff) | |
| download | nixlib-c228b1a957c31dfa89d52ea0aa31eca0b58ba41d.tar nixlib-c228b1a957c31dfa89d52ea0aa31eca0b58ba41d.tar.gz nixlib-c228b1a957c31dfa89d52ea0aa31eca0b58ba41d.tar.bz2 nixlib-c228b1a957c31dfa89d52ea0aa31eca0b58ba41d.tar.lz nixlib-c228b1a957c31dfa89d52ea0aa31eca0b58ba41d.tar.xz nixlib-c228b1a957c31dfa89d52ea0aa31eca0b58ba41d.tar.zst nixlib-c228b1a957c31dfa89d52ea0aa31eca0b58ba41d.zip | |
Ant/GCJ: Clean up.
svn path=/nixpkgs/trunk/; revision=21990
| -rw-r--r-- | pkgs/development/tools/build-managers/apache-ant/from-source.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/build-managers/apache-ant/from-source.nix b/pkgs/development/tools/build-managers/apache-ant/from-source.nix index 2cf588ba377c..240056df0288 100644 --- a/pkgs/development/tools/build-managers/apache-ant/from-source.nix +++ b/pkgs/development/tools/build-managers/apache-ant/from-source.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, javac, jvm, junit }: +{ stdenv, fetchurl, gcj, junit }: let version = "1.7.1"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { patches = [ ./use-gcj.patch ]; - buildInputs = [ javac jvm junit ]; + buildInputs = [ gcj junit ]; configurePhase = '' mkdir -p "tool-aliases/bin" @@ -52,7 +52,7 @@ EOF mv -v "$out/lib/"*.jar "$out/lib/java" sed -i "$out/bin/ant" \ -e "s|^ANT_LIB=.*$|ANT_LIB=$out/lib/java|g ; - s|JAVACMD=java.*$|JAVACMD=$(type -P gij)|g ; + s|JAVACMD=java.*$|JAVACMD=${gcj}/lib/jvm/bin/java|g ; /^ant_exec_command/i export ANT_HOME=$out" ''; @@ -82,8 +82,9 @@ EOF homepage = http://ant.apache.org/; - license = "Apache-2.0"; + license = "APLv2"; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = [ stdenv.lib.platforms.gnu ]; # arbitrary choice }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4f13081a9da..76f3f0212282 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2990,8 +2990,7 @@ let apacheAntGcj = import ../development/tools/build-managers/apache-ant/from-source.nix { inherit fetchurl stdenv; inherit junit; # must be either pre-built or built with GCJ *alone* - javac = gcj; - jvm = gcj; + gcj = gcj.gcc; # use the raw GCJ, which has ${gcj}/lib/jvm }; autobuild = import ../development/tools/misc/autobuild { |