colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/pantheon: Don't enable modules for excludePackages

Browse Source 
ref: bc970e94e7
ref: nixpkgs issue 299877

While at it, also enable flatpak in nixosTests.pantheon so we ensure appcenter builds.
This commit is contained in:
Bobby Rong 2024-04-10 21:27:31 +08:00
parent 14c7a500c0
commit a6ada0502b
No known key found for this signature in database
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -12,6 +12,7 @@ let
extraGSettingsOverrides = cfg.extraGSettingsOverrides;
};
notExcluded = pkg: (!(lib.elem pkg config.environment.pantheon.excludePackages));
in
{
@ -288,8 +289,8 @@ in
})
(mkIf serviceCfg.apps.enable {
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
programs.evince.enable = mkDefault (notExcluded pkgs.gnome.evince);
programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);
environment.systemPackages = utils.removePackagesByName ([
pkgs.gnome.gnome-font-viewer

7
nixos/tests/pantheon.nix
View File

@ -13,6 +13,13 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
services.xserver.enable = true;
services.xserver.desktopManager.pantheon.enable = true;
# We ship pantheon.appcenter by default when this is enabled.
services.flatpak.enable = true;
# We don't ship gnome-text-editor in Pantheon module, we add this line mainly
# to catch eval issues related to this option.
environment.pantheon.excludePackages = [ pkgs.gnome-text-editor ];
environment.systemPackages = [ pkgs.xdotool ];
};