openjdk8: add the architecture passthru from openjdk7

+16 -1
+16 -1
pkgs/development/compilers/openjdk/8.nix
··· 5 5 }: 6 6 7 7 let 8 + 9 + /** 10 + * The JRE libraries are in directories that depend on the CPU. 11 + */ 12 + architecture = 13 + if stdenv.system == "i686-linux" then 14 + "i386" 15 + else if stdenv.system == "x86_64-linux" then 16 + "amd64" 17 + else 18 + throw "openjdk requires i686-linux or x86_64 linux"; 19 + 8 20 update = "60"; 9 21 build = "24"; 10 22 baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; ··· 204 216 platforms = platforms.linux; 205 217 }; 206 218 207 - passthru.home = "${openjdk8}/lib/openjdk"; 219 + passthru = { 220 + inherit architecture; 221 + home = "${openjdk8}/lib/openjdk"; 222 + }; 208 223 }; 209 224 in openjdk8