From ef3e98107f916ab1eeea3e95a5c5895b5a0e73e9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 2 Oct 2024 18:44:58 +0200 Subject: [PATCH] nixos/cinnamon: Enable all x-d-p-gtk portals This will fix the conflict when another DE using the full `xdg-desktop-portal-gtk` is enabled simultaneously with Cinnamon. There will no longer be conflicts at runtime since the portals are now configured by `cinnamon-common` in `xdg.portal.configPackages`. The added closure size should be negligible, as most of the packages are also used by Cinnamon. --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index cd5c9e1c948f..7f824680b92e 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -192,10 +192,7 @@ in xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-xapp - (pkgs.xdg-desktop-portal-gtk.override { - # Do not build portals that we already have. - buildPortalsInGnome = false; - }) + pkgs.xdg-desktop-portal-gtk ]; services.orca.enable = mkDefault (notExcluded pkgs.orca);