public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added x86_64 version of JDK5

Browse Source 
svn path=/nixpkgs/trunk/; revision=10272
This commit is contained in:
Sander van der Burg
2008-01-24 10:14:33 +00:00
parent dac5ce6e48
commit d0792fd3bc
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/jdk/default-5.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}: {stdenv, fetchurl, unzip}:
if stdenv.system == "i686-linux" if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
then then
(import ./jdk5-sun-linux.nix) { (import ./jdk5-sun-linux.nix) {
inherit stdenv fetchurl unzip; inherit stdenv fetchurl unzip;
pkgs/development/compilers/jdk/jdk5-sun-linux.nix
+4 -4
View File
@@ -8,16 +8,16 @@
*/ */
{stdenv, fetchurl, unzip}: {stdenv, fetchurl, unzip}:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "jdk-1.5.0_14"; name = "jdk-1.5.0_14";
filename = "jdk-1_5_0_14"; filename = "jdk-1_5_0_14";
dirname = "jdk1.5.0_14"; dirname = "jdk1.5.0_14";
builder = ./builder.sh; builder = ./builder.sh;
pathname = "/tmp/jdk-1_5_0_14-linux-i586.bin"; pathname = if stdenv.system == "x86_64-linux" then "/tmp/jdk-1_5_0_14-linux-amd64.bin" else "/tmp/jdk-1_5_0_14-linux-i586.bin";
md5 = "32df8f2be09c3a0f39da1b3869164b55"; md5 = if stdenv.system == "x86_64-linux" then "9dc74d939dd42988280f2c22ab9521bf" else "32df8f2be09c3a0f39da1b3869164b55";
stdenv = stdenv;
stdenv = stdenv;
inherit unzip; inherit unzip;
} }
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -1145,7 +1145,7 @@ rec {
}; };
jdk5 = jdk5 =
assert system == "i686-linux"; assert system == "i686-linux" || system == "x86_64-linux";
import ../development/compilers/jdk/default-5.nix { import ../development/compilers/jdk/default-5.nix {
inherit fetchurl stdenv unzip; inherit fetchurl stdenv unzip;
}; };