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

nixos/gnome-settings-daemon: drop package option

Browse Source 
After some thought, it doesn't make sense for this module to be shared.
This commit is contained in:
worldofpeace 2019-09-29 18:51:15 -04:00
parent 4a7964614f
commit 68ab37aa44
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
View File

@ -12,6 +12,12 @@ in
{ {
imports = [
(mkRemovedOptionModule
["services" "gnome3" "gnome-settings-daemon" "package"]
"")
];
###### interface ###### interface
options = { options = {
@ -20,13 +26,6 @@ in
enable = mkEnableOption "GNOME Settings Daemon"; enable = mkEnableOption "GNOME Settings Daemon";
# There are many forks of gnome-settings-daemon
package = mkOption {
type = types.package;
default = pkgs.gnome3.gnome-settings-daemon;
description = "Which gnome-settings-daemon package to use.";
};
}; };
}; };
@ -36,9 +35,13 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [
pkgs.gnome3.gnome-settings-daemon
];
services.udev.packages = [ cfg.package ]; services.udev.packages = [
pkgs.gnome3.gnome-settings-daemon
];
}; };

3
nixos/modules/services/x11/desktop-managers/mate.nix
View File

@ -85,6 +85,7 @@ in
pkgs.gtk3.out pkgs.gtk3.out
pkgs.shared-mime-info pkgs.shared-mime-info
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
pkgs.mate.mate-settings-daemon
]; ];
programs.dconf.enable = true; programs.dconf.enable = true;
@ -98,7 +99,7 @@ in
services.gnome3.at-spi2-core.enable = true; services.gnome3.at-spi2-core.enable = true;
services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-settings-daemon.enable = true; services.gnome3.gnome-settings-daemon.enable = true;
services.gnome3.gnome-settings-daemon.package = pkgs.mate.mate-settings-daemon; services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
services.gvfs.enable = true; services.gvfs.enable = true;
services.upower.enable = config.powerManagement.enable; services.upower.enable = config.powerManagement.enable;

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

@ -119,7 +119,7 @@ in
# TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully
services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-settings-daemon.enable = true; services.gnome3.gnome-settings-daemon.enable = true;
services.gnome3.gnome-settings-daemon.package = pkgs.pantheon.elementary-settings-daemon; services.udev.packages = [ pkgs.pantheon.elementary-settings-daemon ];
services.gvfs.enable = true; services.gvfs.enable = true;
services.gnome3.rygel.enable = mkDefault true; services.gnome3.rygel.enable = mkDefault true;
services.gsignond.enable = mkDefault true; services.gsignond.enable = mkDefault true;