Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shlevy merged 1 commit into from
Aug 27, 2012
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down