Cleaning up the java naming conventions
svn path=/nixpkgs/trunk/; revision=3871
This commit is contained in:
@@ -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];
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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];
|
||||
}
|
||||
|
||||
@@ -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];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user