From 681d6606d350e6686a415d23731f16d9a794ed12 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Sun, 23 Jun 2024 12:25:48 +0100 Subject: [PATCH] Don't use LibreOffice GTK4 --- modules/desktop/office/libreoffice.nix | 36 +++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/desktop/office/libreoffice.nix b/modules/desktop/office/libreoffice.nix index 6e1e00d..5074f19 100644 --- a/modules/desktop/office/libreoffice.nix +++ b/modules/desktop/office/libreoffice.nix @@ -2,23 +2,23 @@ let cfg = config.modules.desktop.office.libreoffice; - libreoffice-gtk4 = pkgs.libreoffice.override { - extraMakeWrapperArgs = [ - "--set SAL_USE_VCLPLUGIN gtk4" - ]; - unwrapped = pkgs.libreoffice-unwrapped.overrideAttrs (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ - pkgs.gtk4 - ]; - configureFlags = oldAttrs.configureFlags ++ [ - "--disable-werror" - "--enable-gtk4" - ]; - passthru = oldAttrs.passthru // { - inherit (pkgs) gtk4; - }; - }); - }; + # libreoffice-gtk4 = pkgs.libreoffice.override { + # extraMakeWrapperArgs = [ + # "--set SAL_USE_VCLPLUGIN gtk4" + # ]; + # unwrapped = pkgs.libreoffice-unwrapped.overrideAttrs (oldAttrs: { + # buildInputs = oldAttrs.buildInputs ++ [ + # pkgs.gtk4 + # ]; + # configureFlags = oldAttrs.configureFlags ++ [ + # "--disable-werror" + # "--enable-gtk4" + # ]; + # passthru = oldAttrs.passthru // { + # inherit (pkgs) gtk4; + # }; + # }); + # }; in { options.modules.desktop.office.libreoffice = { enable = lib.mkOption { @@ -29,7 +29,7 @@ in { config = lib.mkIf cfg.enable { 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 hunspellDicts.en-gb-large hunspellDicts.en-us-large