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.
This commit is contained in:
@@ -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}"
|
||||
|
||||
Reference in New Issue
Block a user