Unverified Commit 14c7a500 authored by Bobby Rong's avatar Bobby Rong
Browse files

nixos/cinnamon: Don't enable modules for excludePackages 

ref: bc970e94
ref: nixpkgs issue 299877
parent ff0dbd94

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

+5 −5
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ in 
      '';



      # Default services

      services.blueman.enable = mkDefault true;

      services.blueman.enable = mkDefault (notExcluded pkgs.blueman);

      hardware.bluetooth.enable = mkDefault true;

      hardware.pulseaudio.enable = mkDefault true;

      security.polkit.enable = true;
@@ -228,10 +228,10 @@ in 
    })



    (mkIf serviceCfg.apps.enable {

      programs.geary.enable = mkDefault true;

      programs.gnome-disks.enable = mkDefault true;

      programs.gnome-terminal.enable = mkDefault true;

      programs.file-roller.enable = mkDefault true;

      programs.geary.enable = mkDefault (notExcluded pkgs.gnome.geary);

      programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility);

      programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal);

      programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);



      environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [

        # cinnamon team apps

nixos/tests/cinnamon.nix

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 
    services.xserver.enable = true;

    services.xserver.desktopManager.cinnamon.enable = true;



    # We don't ship gnome-text-editor in Cinnamon module, we add this line mainly

    # to catch eval issues related to this option.

    environment.cinnamon.excludePackages = [ pkgs.gnome-text-editor ];



    # For the sessionPath subtest.

    services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ];

  };