public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ant/GCJ: Clean up.

Browse Source 
svn path=/nixpkgs/trunk/; revision=21990
This commit is contained in:
Ludovic Courtès 2010-05-26 14:53:13 +00:00
parent b62acd088e
commit c228b1a957
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/build-managers/apache-ant/from-source.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, javac, jvm, junit }: { stdenv, fetchurl, gcj, junit }:
let version = "1.7.1"; in let version = "1.7.1"; in
@ -15,7 +15,7 @@ stdenv.mkDerivation {
patches = [ ./use-gcj.patch ]; patches = [ ./use-gcj.patch ];
buildInputs = [ javac jvm junit ]; buildInputs = [ gcj junit ];
configurePhase = '' configurePhase = ''
mkdir -p "tool-aliases/bin" mkdir -p "tool-aliases/bin"
@ -52,7 +52,7 @@ EOF
mv -v "$out/lib/"*.jar "$out/lib/java" mv -v "$out/lib/"*.jar "$out/lib/java"
sed -i "$out/bin/ant" \ sed -i "$out/bin/ant" \
-e "s|^ANT_LIB=.*$|ANT_LIB=$out/lib/java|g ; -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" /^ant_exec_command/i export ANT_HOME=$out"
''; '';
@ -82,8 +82,9 @@ EOF
homepage = http://ant.apache.org/; homepage = http://ant.apache.org/;
license = "Apache-2.0"; license = "APLv2";
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = [ stdenv.lib.platforms.gnu ]; # arbitrary choice
}; };
} }

3
pkgs/top-level/all-packages.nix
View File

@ -2990,8 +2990,7 @@ let
apacheAntGcj = import ../development/tools/build-managers/apache-ant/from-source.nix { apacheAntGcj = import ../development/tools/build-managers/apache-ant/from-source.nix {
inherit fetchurl stdenv; inherit fetchurl stdenv;
inherit junit; # must be either pre-built or built with GCJ *alone* inherit junit; # must be either pre-built or built with GCJ *alone*
javac = gcj; gcj = gcj.gcc; # use the raw GCJ, which has ${gcj}/lib/jvm
jvm = gcj;
}; };
autobuild = import ../development/tools/misc/autobuild { autobuild = import ../development/tools/misc/autobuild {