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

* Xfce 4.8 doesn't need HAL anymore.

Browse Source 
svn path=/nixos/trunk/; revision=28762
This commit is contained in:
Eelco Dolstra 2011-08-22 22:52:13 +00:00
parent ecbfe0d9c0
commit 3b1c741f3f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/services/x11/desktop-managers/xfce.nix
View File

@ -7,6 +7,8 @@ let
xcfg = config.services.xserver; xcfg = config.services.xserver;
cfg = xcfg.desktopManager.xfce; cfg = xcfg.desktopManager.xfce;
isXfce48 = pkgs.xfce ? libxfce4ui;
in in
{ {
@ -69,12 +71,16 @@ in
pkgs.gnome.gnomeicontheme pkgs.gnome.gnomeicontheme
pkgs.desktop_file_utils pkgs.desktop_file_utils
] ]
++ optionals isXfce48 [
pkgs.xfce.libxfce4ui
pkgs.xfce.garcon
]
++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager; ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager;
environment.pathsToLink = 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; };
}; };