From d0792fd3bc53107771d940637b2358119fa30944 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 24 Jan 2008 10:14:33 +0000
Subject: [PATCH] Added x86_64 version of JDK5

svn path=/nixpkgs/trunk/; revision=10272
---
 pkgs/development/compilers/jdk/default-5.nix      | 2 +-
 pkgs/development/compilers/jdk/jdk5-sun-linux.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/jdk/default-5.nix b/pkgs/development/compilers/jdk/default-5.nix
index 1cb83ca5ddc..9fb52378b3f 100644
--- a/pkgs/development/compilers/jdk/default-5.nix
+++ b/pkgs/development/compilers/jdk/default-5.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, unzip}: 
 
-if stdenv.system == "i686-linux"
+if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
   then
     (import ./jdk5-sun-linux.nix) {
       inherit stdenv fetchurl unzip;
diff --git a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix
index 479a5a456af..6a15b1f9ec9 100644
--- a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix
@@ -8,16 +8,16 @@
  */
 {stdenv, fetchurl, unzip}: 
 
-assert stdenv.system == "i686-linux";
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation {
   name = "jdk-1.5.0_14";
   filename = "jdk-1_5_0_14";
   dirname = "jdk1.5.0_14";
   builder = ./builder.sh;
-  pathname = "/tmp/jdk-1_5_0_14-linux-i586.bin";
-  md5 = "32df8f2be09c3a0f39da1b3869164b55";
+  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 = if stdenv.system == "x86_64-linux" then "9dc74d939dd42988280f2c22ab9521bf" else "32df8f2be09c3a0f39da1b3869164b55";
+  
   stdenv = stdenv;
-
   inherit unzip;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 850a7f05431..ec6aa276b7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1145,11 +1145,11 @@ rec {
     };
 
   jdk5 =
-    assert system == "i686-linux";
+    assert system == "i686-linux" || system == "x86_64-linux";
     import ../development/compilers/jdk/default-5.nix {
       inherit fetchurl stdenv unzip;
     };
-
+  
   jdk       = jdkdistro true  false;
   jre       = jdkdistro false false;