public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shea Levy 2012-08-26 13:33:44 -04:00
parent 84e1da4b09
commit 016b665402
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -2363,8 +2363,12 @@ let
jreOnly = true; jreOnly = true;
}; };
jdk = if stdenv.isDarwin then openjdk else jdkdistro true false; jdk = if (stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
jre = jdkdistro false false; 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); jrePlugin = lowPrio (jdkdistro false true);