diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31cbe85624d..f01ae4a9c0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2359,8 +2359,12 @@ let jreOnly = true; }; - jdk = if stdenv.isDarwin then openjdk else jdkdistro true false; - jre = jdkdistro false false; + jdk = if (stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then openjdk + else jdkdistro true false; + jre = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then openjre + else jdkdistro false false; jrePlugin = lowPrio (jdkdistro false true);