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

java: Use icedtea by default on linux

Browse Source
This commit is contained in:
William A. Kennington III 2015-01-01 15:49:37 -08:00
parent c82410eeda
commit a3eb2465ef
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3483,12 +3483,17 @@ let
{ description = "The open-source Java Runtime Environment"; } { description = "The open-source Java Runtime Environment"; }
pkgs.openjdk.jre)) // { outputs = [ "jre" ]; }; pkgs.openjdk.jre)) // { outputs = [ "jre" ]; };
jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" jdk = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
then pkgs.openjdk then pkgs.icedtea_jdk
else pkgs.oraclejdk; else if stdenv.isDarwin
jre = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjdk # TODO: Use icedtea for darwin
then pkgs.openjre else pkgs.oraclejdk;
else pkgs.oraclejre;
jre = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
then pkgs.icedtea_jre
else if stdenv.isDarwin
then pkgs.openjre # TODO: Use icedtea for darwin
else pkgs.oraclejre;
oraclejdk = pkgs.jdkdistro true false; oraclejdk = pkgs.jdkdistro true false;