diff options
| author | Doron Behar <doron.behar@gmail.com> | 2023-12-24 11:52:51 +0200 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2023-12-24 11:52:54 +0200 |
| commit | 202588714c719d56acbc2a74109ebae87ab0e66b (patch) | |
| tree | a1648351fefc639c702a020eb29dbfbd995cfc3b /pkgs/applications/office/libreoffice | |
| parent | 4fa61810859ac4bbcdf0e8a1014040fac21a83c7 (diff) | |
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.
Diffstat (limited to 'pkgs/applications/office/libreoffice')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e49f4be07b2f8..9f4390621d10e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -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}" |