Unverified Commit a6ada050 authored by Bobby Rong's avatar Bobby Rong
Browse files

nixos/pantheon: Don't enable modules for excludePackages 

ref: bc970e94
ref: nixpkgs issue 299877

While at it, also enable flatpak in nixosTests.pantheon so we ensure appcenter builds.
parent 14c7a500

nixos/modules/services/x11/desktop-managers/pantheon.nix

+3 −2
Original line number Diff line number Diff line
@@ -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

nixos/tests/pantheon.nix

+7 −0
Original line number Diff line number Diff line
@@ -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 ];

  };