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

Added x86_64-linux support to the jdk.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8326
This commit is contained in:
Martin Bravenboer 2007-03-17 14:37:23 +00:00
parent cf3571e85c
commit 03dbe4cf1f
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/jdk/default.nix
View File

@ -1,6 +1,6 @@
args: args:
if args.stdenv.system == "i686-linux" then if args.stdenv.system == "i686-linux" || args.stdenv.system == "x86_64-linux" then
(import ./jdk6-linux.nix) args (import ./jdk6-linux.nix) args
else if args.stdenv.system == "powerpc-linux" then else if args.stdenv.system == "powerpc-linux" then

30
pkgs/development/compilers/jdk/jdk6-linux.nix
View File

@ -6,10 +6,7 @@
, installjdk ? true , installjdk ? true
}: }:
/** assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
* @todo Support x86_64-linux.
*/
assert stdenv.system == "i686-linux";
assert swingSupport -> xlibs != null; assert swingSupport -> xlibs != null;
(stdenv.mkDerivation { (stdenv.mkDerivation {
@ -17,10 +14,18 @@ assert swingSupport -> xlibs != null;
if installjdk then "jdk-1.6.0" else "jre-1.6.0"; if installjdk then "jdk-1.6.0" else "jre-1.6.0";
src = src =
if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = http://download.java.net/dlj/binaries/jdk-6-dlj-linux-i586.bin; url = http://download.java.net/dlj/binaries/jdk-6-dlj-linux-i586.bin;
sha256 = "0rw48124fdc5rhafj6qzrysb4w823jbn3awxgn07kcy1nvnrhkqw"; sha256 = "0rw48124fdc5rhafj6qzrysb4w823jbn3awxgn07kcy1nvnrhkqw";
}; }
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = http://download.java.net/dlj/binaries/jdk-6-dlj-linux-amd64.bin;
sha256 = "1hr16f5kr3xcyhkl3yc2qi2kxg2avr3cmlxv4awpnj0930rmvwzi";
}
else
abort "jdk requires i686-linux or x86_64 linux";
builder = ./dlj-bundle-builder.sh; builder = ./dlj-bundle-builder.sh;
@ -35,10 +40,21 @@ assert swingSupport -> xlibs != null;
buildInputs = [unzip]; buildInputs = [unzip];
libraries = libraries =
(if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi] else []); (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi] else []);
} // { }
//
{
inherit swingSupport; inherit swingSupport;
} // { }
//
/**
* The mozilla plugin is not available in the amd64 distribution (?)
*/
( if stdenv.system == "i686-linux" then
{
mozillaPlugin = mozillaPlugin =
if installjdk then "jre/plugin/i386/ns7" else "/plugin/i386/ns7"; if installjdk then "jre/plugin/i386/ns7" else "/plugin/i386/ns7";
} }
else
{}
)
) )