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/compilers | |
| 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/compilers')
| -rw-r--r-- | pkgs/development/compilers/jdk/default-1.4.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/jdk/jdk5-sun-linux.nix | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/compilers/jdk/default-1.4.nix b/pkgs/development/compilers/jdk/default-1.4.nix new file mode 100644 index 000000000000..097af70bc1c9 --- /dev/null +++ b/pkgs/development/compilers/jdk/default-1.4.nix @@ -0,0 +1,9 @@ +{stdenv, fetchurl}: + +if stdenv.system == "i686-linux" + then + (import ./j2sdk-1.4.x-sun-linux.nix) { + inherit stdenv fetchurl; + } + else + false diff --git a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix index 89fd6ab2a545..81ed02232843 100644 --- a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix +++ b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix @@ -1,6 +1,6 @@ /** - * This Nix expression requires the user to download the j2sdk - * distribution to /tmp. Please obtain j2sdk-1_5_0_05-linux-i586.bin + * This Nix expression requires the user to download the jdk + * distribution to /tmp. Please obtain jdk-1_5_0_05-linux-i586.bin * from java.sun.com by hand and place it in /tmp. Blame Sun, not me. * * Note that this is not necessary if someone has already pushed a @@ -19,6 +19,6 @@ derivation { system = stdenv.system; builder = ./builder.sh; pathname = "/tmp/jdk-1_5_0_05-linux-i586.bin"; - md5 = ""; + md5 = "2f83bf2a38fff1f8ac51b02ec7391ca3"; stdenv = stdenv; } |