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/libraries/java | |
parent | 3919e7593ae7feef27c91842a2c49a7539ee7a01 (diff) |
Cleaning up the java naming conventions
svn path=/nixpkgs/trunk/; revision=3871
Diffstat (limited to 'pkgs/development/libraries/java')
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/libraries/java/aterm/default.nix b/pkgs/development/libraries/java/aterm/default.nix index 5aa11ea0a4a79..35b6ea258ed20 100644 --- a/pkgs/development/libraries/java/aterm/default.nix +++ b/pkgs/development/libraries/java/aterm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, j2sdk, sharedobjects, jjtraveler}: +{stdenv, fetchurl, jdk, sharedobjects, jjtraveler}: stdenv.mkDerivation { name = "aterm-java-1.6"; @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/aterm-java-1.6.tar.gz; md5 = "abf475dae2f5efca865fcdff871feb5e"; }; - buildInputs = [stdenv j2sdk sharedobjects jjtraveler]; + buildInputs = [stdenv jdk sharedobjects jjtraveler]; } diff --git a/pkgs/development/libraries/java/cup/builder.sh b/pkgs/development/libraries/java/cup/builder.sh index 9f9cc5cda6306..ecd33aa1363c2 100755 --- a/pkgs/development/libraries/java/cup/builder.sh +++ b/pkgs/development/libraries/java/cup/builder.sh @@ -3,8 +3,8 @@ set -e tar zxvf $src -$j2sdk/bin/javac java_cup/*.java -$j2sdk/bin/javac java_cup/runtime/*.java +$jdk/bin/javac java_cup/*.java +$jdk/bin/javac java_cup/runtime/*.java mkdir -p $out/java_cup/runtime diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix index 36c6e96332698..1181cef074ecc 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/development/libraries/java/cup/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, j2sdk} : +{stdenv, fetchurl, jdk} : stdenv.mkDerivation { name = "java-cup-10k"; @@ -9,5 +9,5 @@ stdenv.mkDerivation { md5 = "8b11edfec13c590ea443d0f0ae0da479"; }; - inherit j2sdk; + inherit jdk; } diff --git a/pkgs/development/libraries/java/jjtraveler/default.nix b/pkgs/development/libraries/java/jjtraveler/default.nix index ea2c3eb46de5b..01199f9e22fff 100644 --- a/pkgs/development/libraries/java/jjtraveler/default.nix +++ b/pkgs/development/libraries/java/jjtraveler/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, j2sdk}: +{stdenv, fetchurl, jdk}: stdenv.mkDerivation { name = "jjtraveler-0.4.3"; @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/JJTraveler-0.4.3.tar.gz; md5 = "35bf801ee61f042513ae88247fe1bf1d"; }; - buildInputs = [stdenv j2sdk]; + buildInputs = [stdenv jdk]; } diff --git a/pkgs/development/libraries/java/shared-objects/default.nix b/pkgs/development/libraries/java/shared-objects/default.nix index d863679c16e9e..cc76ca8ac4a48 100644 --- a/pkgs/development/libraries/java/shared-objects/default.nix +++ b/pkgs/development/libraries/java/shared-objects/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, j2sdk}: +{stdenv, fetchurl, jdk}: stdenv.mkDerivation { name = "shared-objects-1.4"; @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = http://nix.cs.uu.nl/dist/tarballs/shared-objects-1.4.tar.gz; md5 = "c1f2c58bd1a07be32da8a6b89354a11f"; }; - buildInputs = [stdenv j2sdk]; + buildInputs = [stdenv jdk]; } |