tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
libreoffice: add withJava option
Stefan Frijters
6 months ago
5e249aae
434ed09b
+15
-7
1 changed file
expand all
collapse all
unified
split
pkgs
applications
office
libreoffice
default.nix
+15
-7
pkgs/applications/office/libreoffice/default.nix
···
130
130
],
131
131
withFonts ? false,
132
132
withHelp ? true,
133
133
+
withJava ? true,
133
134
kdeIntegration ? false,
134
135
variant ? "fresh",
135
136
debugLogging ? variant == "still",
···
349
350
'';
350
351
351
352
nativeBuildInputs = [
352
352
-
ant
353
353
autoconf
354
354
automake
355
355
bison
···
359
359
gettext
360
360
gperf
361
361
icu
362
362
-
jdk21
363
362
libmysqlclient
364
363
libtool
365
364
libxml2
···
374
373
]
375
374
++ optionals kdeIntegration [
376
375
qt6.qtbase
376
376
+
]
377
377
+
++ optionals withJava [
378
378
+
ant
379
379
+
jdk21
377
380
];
378
381
379
382
buildInputs =
···
409
412
(harfbuzz.override { withIcu = true; })
410
413
hunspell
411
414
icu
412
412
-
jre'
413
415
lcms2
414
416
libGL
415
417
libGLU
···
474
476
qt6.qtbase
475
477
kdePackages.kcoreaddons
476
478
kdePackages.kio
479
479
+
]
480
480
+
++ optionals withJava [
481
481
+
jre'
477
482
];
478
483
479
484
preConfigure = ''
···
516
521
"--without-buildconfig-recorded"
517
522
518
523
(lib.withFeature withHelp "help")
519
519
-
"--with-beanshell-jar=${bsh}"
520
524
"--with-vendor=NixOS"
521
525
"--disable-report-builder"
522
526
"--disable-online-update"
···
524
528
"--enable-dbus"
525
529
"--enable-release-build"
526
530
"--enable-epm"
527
527
-
"--with-ant-home=${ant.home}"
531
531
+
(lib.withFeature withJava "java")
528
532
529
533
# Without these, configure does not finish
530
534
"--without-junit"
···
543
547
(lib.withFeature withFonts "fonts")
544
548
"--without-doxygen"
545
549
546
546
-
"--with-system-beanshell"
547
550
"--with-system-cairo"
548
551
"--with-system-coinmp"
549
552
"--with-system-headers"
···
596
599
"--enable-kf6"
597
600
"--enable-qt6"
598
601
]
602
602
+
++ optionals withJava [
603
603
+
"--with-system-beanshell"
604
604
+
"--with-ant-home=${ant.home}"
605
605
+
"--with-beanshell-jar=${bsh}"
606
606
+
]
599
607
++ (
600
608
if variant == "fresh" || variant == "collabora" then
601
609
[
···
670
678
671
679
passthru = {
672
680
inherit srcs;
673
673
-
jdk = jre';
681
681
+
jdk = if withJava then jre' else null;
674
682
python = python311; # for unoconv
675
683
updateScript = [
676
684
./update.sh