Don't use LibreOffice GTK4
This commit is contained in:
parent
9086701c4f
commit
681d6606d3
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user