diff options
author | Matt McHenry <github@matt.mchenryfamily.org> | 2022-10-28 14:49:31 -0400 |
---|---|---|
committer | Matt McHenry <github@matt.mchenryfamily.org> | 2022-11-22 20:33:24 -0500 |
commit | e7cfa26a8684bbc1a73ccc22be0cecf39c830b58 (patch) | |
tree | 471d522448a7779be5370798c86d7da91cbf2d23 /pkgs/applications/office | |
parent | 0e33de85ae1ffcc43c1cdc9a64bae23bf2c79085 (diff) |
openjdk: init 19.0.1
as usual this is mostly copy-pasted from 18, so this commit is best reviewed with '--find-copies-harder' stop exposing openjdk 18 since it was not a long-term support release change the default openjdk from 17 to 19 since nixpkgs is a rolling-release repository drop the ceremony around bootstrapping via adoptopenjdk for 64-bit builds vs. via earlier openjdk builds for 32-bit, because, to be frank, since we're using temurin now, it's not a simple copy-paste job. :-/ if someone needs a 32-bit openjdk, that work can be done separately. JavaFX revs from 17 to 19; it looks like 18 was never packaged along with JDK 18. * the gradle invocation used to build JavaFX must still be done with Java 18, as gradle does not yet support running itself on Java 19. * a couple of patches need to be applied, since a new State enum was introduced in the JDK that collides with one in JavaFX. * the hash of the gradle dependencies has not changed, which is surprising, but as far as I can tell correct. One application (libreoffice) doesn't work with 19 yet, so pin it to jdk 17 for now. Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 4c3a4bd988442..6fe65b6443c6d 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -32,12 +32,12 @@ , which , icu , boost -, jdk +, jdk17 , ant , cups , xorg , fontforge -, jre_minimal +, jre17_minimal , openssl , gperf , cppunit @@ -121,7 +121,7 @@ let getDev getLib optional optionals optionalString; - jre' = jre_minimal.override { + jre' = jre17_minimal.override { modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ]; }; @@ -460,7 +460,7 @@ in bison fontforge gdb - jdk + jdk17 libtool pkg-config ] |