diff options
| author | Bryan Gardiner <bog@khumba.net> | 2015-09-10 09:37:27 -0700 |
|---|---|---|
| committer | Bryan Gardiner <bog@khumba.net> | 2015-09-16 06:42:22 -0700 |
| commit | 4140c7fe16d58c79f98d8a29abda1e4cda116924 (patch) | |
| tree | 3528a064758f92f92be58f5566c296a7c37c5b91 /pkgs/development/compilers/openjdk | |
| parent | 54ced3be71424cd9d929826929551764b0b1fa2c (diff) | |
| download | nixlib-4140c7fe16d58c79f98d8a29abda1e4cda116924.tar nixlib-4140c7fe16d58c79f98d8a29abda1e4cda116924.tar.gz nixlib-4140c7fe16d58c79f98d8a29abda1e4cda116924.tar.bz2 nixlib-4140c7fe16d58c79f98d8a29abda1e4cda116924.tar.lz nixlib-4140c7fe16d58c79f98d8a29abda1e4cda116924.tar.xz nixlib-4140c7fe16d58c79f98d8a29abda1e4cda116924.tar.zst nixlib-4140c7fe16d58c79f98d8a29abda1e4cda116924.zip | |
openjdk8: add the architecture passthru from openjdk7
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index bb1bba5d1c6f..0e9184e1c628 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -5,6 +5,18 @@ }: 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"; build = "24"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; @@ -204,6 +216,9 @@ let platforms = platforms.linux; }; - passthru.home = "${openjdk8}/lib/openjdk"; + passthru = { + inherit architecture; + home = "${openjdk8}/lib/openjdk"; + }; }; in openjdk8 |