Author: eelco
Date: Mon Aug 22 22:52:13 2011
New Revision: 28762
URL: https://svn.nixos.org/websvn/nix/?rev=28762&sc=1
Log:
* Xfce 4.8 doesn't need HAL anymore.
Modified:
nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
Modified: nixos/trunk/modules/services/x11/desktop-managers/xfce.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Aug 22
22:51:23 2011 (r28761)
+++ nixos/trunk/modules/services/x11/desktop-managers/xfce.nix Mon Aug 22
22:52:13 2011 (r28762)
@@ -7,6 +7,8 @@
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.xfce;
+ isXfce48 = pkgs.xfce ? libxfce4ui;
+
in
{
@@ -69,12 +71,16 @@
pkgs.gnome.gnomeicontheme
pkgs.desktop_file_utils
]
+ ++ optionals isXfce48 [
+ pkgs.xfce.libxfce4ui
+ pkgs.xfce.garcon
+ ]
++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
environment.pathsToLink =
- [ "/share/xfce4" "/share/themes" "/share/mime" ];
+ [ "/share/xfce4" "/share/themes" "/share/mime"
"/share/desktop-directories" ];
- services.hal.enable = true;
+ services.hal = mkIf (!isXfce48) { enable = true; };
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
