mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
Default 'jdk' and 'jre' to openjdk and openjre, respectively, on supporting systems
This commit is contained in:
parent
84e1da4b09
commit
016b665402
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user