diff options
| author | Shea Levy <shea@shealevy.com> | 2012-08-26 13:33:44 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-08-26 13:33:44 -0400 |
| commit | 016b665402807c7c4f54622cce75fd94c13aa55e (patch) | |
| tree | c0ea4f31960053718877dd85774346c9cf5987f6 /pkgs | |
| parent | 84e1da4b09e2332447e5a2d9fc4e45b2499d7cc0 (diff) | |
| download | nixlib-016b665402807c7c4f54622cce75fd94c13aa55e.tar nixlib-016b665402807c7c4f54622cce75fd94c13aa55e.tar.gz nixlib-016b665402807c7c4f54622cce75fd94c13aa55e.tar.bz2 nixlib-016b665402807c7c4f54622cce75fd94c13aa55e.tar.lz nixlib-016b665402807c7c4f54622cce75fd94c13aa55e.tar.xz nixlib-016b665402807c7c4f54622cce75fd94c13aa55e.tar.zst nixlib-016b665402807c7c4f54622cce75fd94c13aa55e.zip | |
Default 'jdk' and 'jre' to openjdk and openjre, respectively, on supporting systems
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36ec708e8ca6..b09de3fe16ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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); |