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/java | |
| parent | 3919e7593ae7feef27c91842a2c49a7539ee7a01 (diff) | |
| download | nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.gz nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.bz2 nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.lz nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.xz nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.tar.zst nixlib-4c70ef7e5dc4e65c989160a54ad104beaa1b10d5.zip | |
Cleaning up the java naming conventions
svn path=/nixpkgs/trunk/; revision=3871
Diffstat (limited to 'pkgs/development/tools/java')
| -rwxr-xr-x | pkgs/development/tools/java/jclasslib/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/java/jclasslib/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/java/jclasslib/builder.sh b/pkgs/development/tools/java/jclasslib/builder.sh index 56407b376e37..2c9be51476c1 100755 --- a/pkgs/development/tools/java/jclasslib/builder.sh +++ b/pkgs/development/tools/java/jclasslib/builder.sh @@ -14,9 +14,9 @@ mv build/jclasslib.jar $out/bin/ || exit 1 cat >> $out/bin/jclasslib <<EOF #! /bin/sh -export JAVA_HOME=$j2re +export JAVA_HOME=$jre -$j2re/bin/java -jar $out/bin/jclasslib.jar \$@ +$jre/bin/java -jar $out/bin/jclasslib.jar \$@ EOF chmod a+x $out/bin/jclasslib || exit 1 diff --git a/pkgs/development/tools/java/jclasslib/default.nix b/pkgs/development/tools/java/jclasslib/default.nix index f87edb3eab01..dc0d475c4389 100644 --- a/pkgs/development/tools/java/jclasslib/default.nix +++ b/pkgs/development/tools/java/jclasslib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xpf, j2re, ant}: +{stdenv, fetchurl, xpf, jre, ant}: stdenv.mkDerivation { name = "jclasslib-2.0"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { md5 = "31d91bb03fee23410689d2f1c4c439b1"; }; - inherit j2re xpf ant; + inherit jre xpf ant; buildInputs = [xpf ant]; } |