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

libreoffice: build with jdk21 (#359040)

Browse Source
This commit is contained in:
7c6f434c 2024-11-27 05:45:28 +00:00 committed by GitHub
commit 241ced5a31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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
, 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
];

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

@ -6597,6 +6597,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;