Unverified Commit ad34ac9b authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

libreoffice: hide rhino behind withJava option (#457932)

parents d6ad1ad1 71b0bb47

pkgs/applications/office/libreoffice/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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}"