From 71b0bb479fdcaa5c72e0fddd362ada16d0abea61 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 3 Nov 2025 00:34:54 +0100 Subject: [PATCH] libreoffice: hide rhino behind withJava option This should not meaningfully change the build without Java, but it prevents eval from complaining about nonSource packages related to rhino. --- pkgs/applications/office/libreoffice/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c177eae425c6..1ef286791917 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -617,9 +617,6 @@ stdenv.mkDerivation (finalAttrs: { # cannot find headers, no idea why "--without-system-boost" - "--with-system-rhino" - "--with-rhino-jar=${rhino}/share/java/js.jar" - "--without-system-java-websocket" ] ++ optionals kdeIntegration [ @@ -627,6 +624,9 @@ stdenv.mkDerivation (finalAttrs: { "--enable-qt6" ] ++ optionals withJava [ + "--with-system-rhino" + "--with-rhino-jar=${rhino}/share/java/js.jar" + "--with-system-beanshell" "--with-ant-home=${ant.home}" "--with-beanshell-jar=${bsh}"