jordan/nix-config
1
1
Fork 0
Code Issues 14 Pull Requests Actions Projects 3 Wiki Activity

Don't use LibreOffice GTK4

Browse Source
This commit is contained in:
Jordan Holt 2024-06-23 12:25:48 +01:00
parent 9086701c4f
commit 681d6606d3
Signed by: jordan
GPG Key ID: B8CFFF61F1CCF520
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/desktop/office/libreoffice.nix
View File

@ -2,23 +2,23 @@
let let
cfg = config.modules.desktop.office.libreoffice; cfg = config.modules.desktop.office.libreoffice;
libreoffice-gtk4 = pkgs.libreoffice.override { # libreoffice-gtk4 = pkgs.libreoffice.override {
extraMakeWrapperArgs = [ # extraMakeWrapperArgs = [
"--set SAL_USE_VCLPLUGIN gtk4" # "--set SAL_USE_VCLPLUGIN gtk4"
]; # ];
unwrapped = pkgs.libreoffice-unwrapped.overrideAttrs (oldAttrs: { # unwrapped = pkgs.libreoffice-unwrapped.overrideAttrs (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ # buildInputs = oldAttrs.buildInputs ++ [
pkgs.gtk4 # pkgs.gtk4
]; # ];
configureFlags = oldAttrs.configureFlags ++ [ # configureFlags = oldAttrs.configureFlags ++ [
"--disable-werror" # "--disable-werror"
"--enable-gtk4" # "--enable-gtk4"
]; # ];
passthru = oldAttrs.passthru // { # passthru = oldAttrs.passthru // {
inherit (pkgs) gtk4; # inherit (pkgs) gtk4;
}; # };
}); # });
}; # };
in { in {
options.modules.desktop.office.libreoffice = { options.modules.desktop.office.libreoffice = {
enable = lib.mkOption { enable = lib.mkOption {
@ -29,7 +29,7 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
user.packages = with pkgs; [ user.packages = with pkgs; [
(if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice-gtk4) (if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice)
hunspell hunspell
hunspellDicts.en-gb-large hunspellDicts.en-gb-large
hunspellDicts.en-us-large hunspellDicts.en-us-large