From 31fa07312f8d902394c58784e871a211d92bee4c Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 25 Nov 2024 17:25:38 +0100
Subject: [PATCH] libreoffice: build with jdk21

Change-Id: Ic9fee1f8b0194d41200193b2c7c4d4ccaa102401
---
 pkgs/applications/office/libreoffice/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                  | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index e9a97025455c..efd3b01a7d16 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -34,12 +34,12 @@
 , which
 , icu
 , boost
-, jdk17
+, jdk21
 , ant
 , cups
 , xorg
 , fontforge
-, jre17_minimal
+, jre21_minimal
 , openssl
 , gperf
 , cppunit
@@ -177,7 +177,7 @@ let
     ];
   };
 
-  jre' = jre17_minimal.override {
+  jre' = jre21_minimal.override {
     modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ];
   };
 
@@ -298,7 +298,7 @@ in stdenv.mkDerivation (finalAttrs: {
     bison
     fontforge
     gdb
-    jdk17
+    jdk21
     libtool
     pkg-config
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 444d80f40cb4..f4c0b0596568 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6623,6 +6623,9 @@ with pkgs;
   jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix {
     jdk = jdk17;
   };
+  jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix {
+    jdk = jdk21;
+  };
   jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { };
 
   openjdk = jdk;