dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

libreoffice: build with jdk21

Browse Source 
Change-Id: Ic9fee1f8b0194d41200193b2c7c4d4ccaa102401
This commit is contained in:
Yureka 2024-11-25 17:25:38 +01:00
parent 15bd4e4059
commit 31fa07312f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/office/libreoffice/default.nix
View File

@ -34,12 +34,12 @@
, which , which
, icu , icu
, boost , boost
, jdk17 , jdk21
, ant , ant
, cups , cups
, xorg , xorg
, fontforge , fontforge
, jre17_minimal , jre21_minimal
, openssl , openssl
, gperf , gperf
, cppunit , cppunit
@ -177,7 +177,7 @@ let
]; ];
}; };
jre' = jre17_minimal.override { jre' = jre21_minimal.override {
modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ]; modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ];
}; };
@ -298,7 +298,7 @@ in stdenv.mkDerivation (finalAttrs: {
bison bison
fontforge fontforge
gdb gdb
jdk17 jdk21
libtool libtool
pkg-config pkg-config
]; ];

3
pkgs/top-level/all-packages.nix
View File

@ -6623,6 +6623,9 @@ with pkgs;
jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix { jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix {
jdk = jdk17; jdk = jdk17;
}; };
jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix {
jdk = jdk21;
};
jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { }; jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { };
openjdk = jdk; openjdk = jdk;