From 2a8a59aebb851f48004c5b659909f3fb2c4bd189 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 10 Apr 2024 21:33:34 +0800 Subject: [PATCH] nixos/budgie: Don't enable modules for excludePackages ref: bc970e94e786d554237c931457ac50f5c415b9f0 ref: nixpkgs issue 299877 --- nixos/modules/services/x11/desktop-managers/budgie.nix | 4 +++- nixos/tests/budgie.nix | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 466ef5c565b7..e39507622cde 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -43,6 +43,8 @@ let budgie-control-center = pkgs.budgie.budgie-control-center.override { enableSshSocket = config.services.openssh.startWhenNeeded; }; + + notExcluded = pkg: (!(lib.elem pkg config.environment.budgie.excludePackages)); in { meta.maintainers = lib.teams.budgie.members; @@ -160,7 +162,7 @@ in { ++ cfg.sessionPath; # Both budgie-desktop-view and nemo defaults to this emulator. - programs.gnome-terminal.enable = mkDefault true; + programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal); # Fonts. fonts.packages = [ diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index 5228e869b056..203e718c8c6d 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -18,6 +18,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; }; + # We don't ship gnome-text-editor in Budgie module, we add this line mainly + # to catch eval issues related to this option. + environment.budgie.excludePackages = [ pkgs.gnome-text-editor ]; + services.xserver.desktopManager.budgie = { enable = true; extraPlugins = [