Author: eelco
Date: Mon Aug 22 23:10:24 2011
New Revision: 28764
URL: https://svn.nixos.org/websvn/nix/?rev=28764&sc=1
Log:
* Enable upower and udisks for Xfce 4.8.
Modified:
nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
Modified: nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Mon Aug 22
23:08:42 2011 (r28763)
+++ nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Mon Aug 22
23:10:24 2011 (r28764)
@@ -140,10 +140,10 @@
target = "X11/xkb";
};
- # Enable required DBus services.
+ # Enable helpful DBus services.
services.hal = mkIf (!isKDE47) { enable = true; };
services.udisks = mkIf isKDE47 { enable = true; };
- services.upower = mkIf isKDE47 { enable = true; };
+ services.upower = mkIf (isKDE47 && config.powerManagement.enable) { enable
= true; };
};
Modified: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Aug 22
23:08:42 2011 (r28763)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Aug 22
23:10:24 2011 (r28764)
@@ -80,7 +80,10 @@
environment.pathsToLink =
[ "/share/xfce4" "/share/themes" "/share/mime"
"/share/desktop-directories" ];
+ # Enable helpful DBus services.
services.hal = mkIf (!isXfce48) { enable = true; };
+ services.udisks = mkIf isXfce48 { enable = true; };
+ services.upower = mkIf (isXfce48 && config.powerManagement.enable) {
enable = true; };
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
