From 8e1ad9ba9270df6bb4ea7dddeeb9a3a1b33b75a5 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Fri, 4 Aug 2023 17:26:19 -0700 Subject: [PATCH 1/2] gnome: check for package exclusions by name for default program modules This matches how `environment.gnome.excludePackages` works elsewhere, and prevents evaluation from failing when an excluded package is not available (e.g. by having a blocklisted license). --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 5d950f7d7fc5..93e39acb21ad 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -59,7 +59,7 @@ let enableGnomePanel = true; } ++ cfg.flashback.customSessions; - notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome.excludePackages)); + notExcluded = pkg: mkDefault (!(lib.elem (lib.getName pkg) (map lib.getName config.environment.gnome.excludePackages))); in From 541afcbc9b16d4d63391f85d21d920de9f247dba Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Fri, 4 Aug 2023 17:26:21 -0700 Subject: [PATCH 2/2] cinnamon: check for package exclusions by name for themes This matches how package exclusions are handled elsewhere. --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index b3cbe4c324df..ff3594810885 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -12,7 +12,7 @@ let extraGSettingsOverrides = cfg.extraGSettingsOverrides; }; - notExcluded = pkg: (!(lib.elem pkg config.environment.cinnamon.excludePackages)); + notExcluded = pkg: (!(lib.elem (lib.getName pkg) (map lib.getName config.environment.cinnamon.excludePackages))); in {