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

openjdk8: add the architecture passthru from openjdk7

Browse Source
This commit is contained in:
Bryan Gardiner 2015-09-10 09:37:27 -07:00
parent 54ced3be71
commit 4140c7fe16
No known key found for this signature in database
GPG Key ID: 53EFBCA063E6183C
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/compilers/openjdk/8.nix
View File

@ -5,6 +5,18 @@
}: }:
let let
/**
* 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
throw "openjdk requires i686-linux or x86_64 linux";
update = "60"; update = "60";
build = "24"; build = "24";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
@ -204,6 +216,9 @@ let
platforms = platforms.linux; platforms = platforms.linux;
}; };
passthru.home = "${openjdk8}/lib/openjdk"; passthru = {
inherit architecture;
home = "${openjdk8}/lib/openjdk";
};
}; };
in openjdk8 in openjdk8