lol

libreoffice: add withJava option

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