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

Drop xfce-4.6 compatibility

Browse Source
This commit is contained in:
Eelco Dolstra 2012-09-21 11:03:07 -04:00
parent d4af6edd5e
commit 600d43ba93
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,8 +7,6 @@ let
xcfg = config.services.xserver; xcfg = config.services.xserver;
cfg = xcfg.desktopManager.xfce; cfg = xcfg.desktopManager.xfce;
isXfce48 = pkgs.xfce ? libxfce4ui;
in in
{ {
@ -45,8 +43,7 @@ in
}; };
environment.systemPackages = environment.systemPackages =
[ [ pkgs.gtk # To get GTK+'s themes.
pkgs.gtk # To get GTK+'s themes.
pkgs.hicolor_icon_theme pkgs.hicolor_icon_theme
pkgs.shared_mime_info pkgs.shared_mime_info
pkgs.which # Needed by the xfce's xinitrc script. pkgs.which # Needed by the xfce's xinitrc script.
@ -70,8 +67,6 @@ in
# "utilities-terminal" and "accessories-text-editor". # "utilities-terminal" and "accessories-text-editor".
pkgs.gnome.gnomeicontheme pkgs.gnome.gnomeicontheme
pkgs.desktop_file_utils pkgs.desktop_file_utils
]
++ optionals isXfce48 [
pkgs.xfce.libxfce4ui pkgs.xfce.libxfce4ui
pkgs.xfce.garcon pkgs.xfce.garcon
pkgs.xfce.thunar_volman pkgs.xfce.thunar_volman
@ -83,15 +78,14 @@ in
environment.pathsToLink = environment.pathsToLink =
[ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" ]; [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" ];
environment.shellInit = optionalString isXfce48 environment.shellInit =
'' ''
export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules
''; '';
# Enable helpful DBus services. # Enable helpful DBus services.
services.hal = mkIf (!isXfce48) { enable = true; }; services.udisks.enable = true;
services.udisks = mkIf isXfce48 { enable = true; }; services.upower.enable = config.powerManagement.enable;
services.upower = mkIf (isXfce48 && config.powerManagement.enable) { enable = true; };
}; };