diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-09-17 23:58:51 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-09-17 23:58:51 +0000 |
| commit | 4c70ef7e5dc4e65c989160a54ad104beaa1b10d5 (patch) | |
| tree | c8e0fff64e5565608c717839fa7d25c20d9b6f35 /pkgs/development/tools/build-managers/apache-ant | |
| parent | 3919e7593ae7feef27c91842a2c49a7539ee7a01 (diff) | |
Cleaning up the java naming conventions
svn path=/nixpkgs/trunk/; revision=3871
Diffstat (limited to 'pkgs/development/tools/build-managers/apache-ant')
| -rw-r--r-- | pkgs/development/tools/build-managers/apache-ant/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/apache-ant/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/apache-ant/builder.sh b/pkgs/development/tools/build-managers/apache-ant/builder.sh index 6a35394749eb4..f6fba7275d3dc 100644 --- a/pkgs/development/tools/build-managers/apache-ant/builder.sh +++ b/pkgs/development/tools/build-managers/apache-ant/builder.sh @@ -5,8 +5,8 @@ mkdir -p $out/bin || exit 1 cat >> $out/bin/ant <<EOF #! /bin/sh -export JAVA_HOME=$j2sdk -export JAVACMD=$j2sdk/bin/java +export JAVA_HOME=$jdk +export JAVACMD=$jdk/bin/java export ANT_OPTS="" export ANT_ARGS="" export LANG="en_US" diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index cbedddcee212b..2532db69f97f1 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, j2sdk, name}: +{stdenv, fetchurl, jdk, name}: let { body = stdenv.mkDerivation { name = name; builder = ./builder.sh; - buildInputs = [ant j2sdk]; - inherit ant j2sdk; + buildInputs = [ant jdk]; + inherit ant jdk; }; ant = |