Commit 20258871 authored by Doron Behar's avatar Doron Behar
Browse files

libreoffice-unwrapped: fix default --with-help build value

Previously, only if `withHelp` was `false`, we added the `./configure`
flag `--without-help`, but apparently `--without-help` does nothing, as
not building help is the default behavior. Using `lib.withFeature` gives
the most expected behavior no matter what are the defaults. Quoting from
`./configure --help` for reference:

> --with-help             Enable the build of help. There is a special
>                         parameter "common" that can be used to bundle only
>                         the common part, .e.g help-specific icons. This is
>                         useful when you build the helpcontent separately.
>
>                         Usage:     --with-help    build the old local help
>                                --without-help     no local help (default)
>                                --with-help=html   build the new HTML local help
>                                --with-help=online build the new HTML online help

This commit fixes #276400.
parent 4fa61810
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ in stdenv.mkDerivation (finalAttrs: {
  dontWrapQtApps = true;

  configureFlags = [
    (lib.optionalString (!withHelp) "--without-help")
    (lib.withFeature withHelp "help")
    "--with-boost=${getDev boost}"
    "--with-boost-libdir=${getLib boost}/lib"
    "--with-beanshell-jar=${bsh}"