Default 'jdk' and 'jre' to openjdk and openjre, respectively, on supporting systems

This commit is contained in:
Shea Levy 2012-08-26 13:33:44 -04:00
parent 84e1da4b09
commit 016b665402

View File

@ -2363,8 +2363,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);