diff options
author | Matt McHenry <github@matt.mchenryfamily.org> | 2018-03-25 20:14:55 -0400 |
---|---|---|
committer | Matt McHenry <github@matt.mchenryfamily.org> | 2018-03-25 20:23:12 -0400 |
commit | aabf45c1637f3de98c5ca89188573985fbff153d (patch) | |
tree | 1a128661ecfc14dcaf1f655f5f2d5a7936e853c8 /pkgs/top-level | |
parent | a0c525bd0a93fba70471392b8651882b52197788 (diff) | |
download | nixlib-aabf45c1637f3de98c5ca89188573985fbff153d.tar nixlib-aabf45c1637f3de98c5ca89188573985fbff153d.tar.gz nixlib-aabf45c1637f3de98c5ca89188573985fbff153d.tar.bz2 nixlib-aabf45c1637f3de98c5ca89188573985fbff153d.tar.lz nixlib-aabf45c1637f3de98c5ca89188573985fbff153d.tar.xz nixlib-aabf45c1637f3de98c5ca89188573985fbff153d.tar.zst nixlib-aabf45c1637f3de98c5ca89188573985fbff153d.zip |
openjdk10: minor cleanups
* with only one source bundle (per JEP-296), we can use src instead of srcs, and avoid the need to cd in prePatch * fetch sources from jdk10u instead of jdk10, to make it easier to grab updates when they start coming. * removed commented-out code that became irrelevant in the 8 -> 9 transition (*.pf files, infinality font rendering) * create jdk10, jre10, and jre10_headless attributes in all-packages.nix
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4726f59b893..969f94b5cde7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6423,6 +6423,20 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + jdk10 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; }; + jre10 = if stdenv.isArm || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } + (openjdk10.jre // { outputs = [ "jre" ]; })); + jre10_headless = + if stdenv.isArm || stdenv.isAarch64 then + oraclejre10 + else if stdenv.isDarwin then + jre10 + else + lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless" + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } + ((openjdk10.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + jdk = jdk8; jre = jre8; jre_headless = jre8_headless; |