libreoffice: add withJava option

This commit is contained in:
Stefan Frijters
2025-09-15 17:32:46 +02:00
parent 434ed09bd1
commit 5e249aae04
@@ -130,6 +130,7 @@
],
withFonts ? false,
withHelp ? true,
withJava ? true,
kdeIntegration ? false,
variant ? "fresh",
debugLogging ? variant == "still",
@@ -349,7 +350,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
nativeBuildInputs = [
ant
autoconf
automake
bison
@@ -359,7 +359,6 @@ stdenv.mkDerivation (finalAttrs: {
gettext
gperf
icu
jdk21
libmysqlclient
libtool
libxml2
@@ -374,6 +373,10 @@ stdenv.mkDerivation (finalAttrs: {
]
++ optionals kdeIntegration [
qt6.qtbase
]
++ optionals withJava [
ant
jdk21
];
buildInputs =
@@ -409,7 +412,6 @@ stdenv.mkDerivation (finalAttrs: {
(harfbuzz.override { withIcu = true; })
hunspell
icu
jre'
lcms2
libGL
libGLU
@@ -474,6 +476,9 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qtbase
kdePackages.kcoreaddons
kdePackages.kio
]
++ optionals withJava [
jre'
];
preConfigure = ''
@@ -516,7 +521,6 @@ stdenv.mkDerivation (finalAttrs: {
"--without-buildconfig-recorded"
(lib.withFeature withHelp "help")
"--with-beanshell-jar=${bsh}"
"--with-vendor=NixOS"
"--disable-report-builder"
"--disable-online-update"
@@ -524,7 +528,7 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-dbus"
"--enable-release-build"
"--enable-epm"
"--with-ant-home=${ant.home}"
(lib.withFeature withJava "java")
# Without these, configure does not finish
"--without-junit"
@@ -543,7 +547,6 @@ stdenv.mkDerivation (finalAttrs: {
(lib.withFeature withFonts "fonts")
"--without-doxygen"
"--with-system-beanshell"
"--with-system-cairo"
"--with-system-coinmp"
"--with-system-headers"
@@ -596,6 +599,11 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-kf6"
"--enable-qt6"
]
++ optionals withJava [
"--with-system-beanshell"
"--with-ant-home=${ant.home}"
"--with-beanshell-jar=${bsh}"
]
++ (
if variant == "fresh" || variant == "collabora" then
[
@@ -670,7 +678,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
inherit srcs;
jdk = jre';
jdk = if withJava then jre' else null;
python = python311; # for unoconv
updateScript = [
./update.sh