ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-05 20:11:43 +03:00
Code Issues Projects Releases Wiki Activity

Fixes in x86_64 support for the jdk.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8329
This commit is contained in:
Martin Bravenboer 2007-03-18 00:33:32 +00:00
parent 03dbe4cf1f
commit d86846bb6a
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/jdk/dlj-bundle-builder.sh
View File

@ -32,9 +32,9 @@ for i in $libraries; do
done done
if test -z "$installjdk"; then if test -z "$installjdk"; then
rpath=$rpath${rpath:+:}$out/lib/i386/jli rpath=$rpath${rpath:+:}$out/lib/$architecture/jli
else else
rpath=$rpath${rpath:+:}$out/jre/lib/i386/jli rpath=$rpath${rpath:+:}$out/jre/lib/$architecture/jli
fi fi
# set all the dynamic linkers # set all the dynamic linkers

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

@ -37,6 +37,17 @@ assert swingSupport -> xlibs != null;
construct = ./jdk6-construct.sh; construct = ./jdk6-construct.sh;
inherit installjdk; inherit installjdk;
/**
* The JRE libraries are in directories that depend on the CPU.
*/
architecture =
if stdenv.system == "i686-linux" then
"i386"
else if stdenv.system == "x86_64-linux" then
"amd64"
else
abort "jdk requires i686-linux or x86_64 linux";
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 []);
@ -52,7 +63,7 @@ assert swingSupport -> xlibs != null;
( if stdenv.system == "i686-linux" then ( 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 else
{} {}