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

* Xfce is now more or less functional. 

svn path=/nixos/trunk/; revision=23075
This commit is contained in:
Eelco Dolstra 2010-08-09 21:59:34 +00:00
parent 31db968be4
commit c388446bb0
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/config/system-path.nix
View File

@ -97,11 +97,16 @@ let
paths = list; paths = list;
inherit (cfg) pathsToLink; inherit (cfg) pathsToLink;
ignoreCollisions = true; ignoreCollisions = true;
# !!! Hacky, should modularise.
postBuild = postBuild =
'' ''
if [ -x $out/bin/update-mime-database -a -d $out/share/mime/packages ]; then if [ -x $out/bin/update-mime-database -a -d $out/share/mime/packages ]; then
$out/bin/update-mime-database -V $out/share/mime $out/bin/update-mime-database -V $out/share/mime
fi fi
if [ -x $out/bin/gtk-update-icon-cache -a -d $out/share/icons/hicolor ]; then
$out/bin/gtk-update-icon-cache $out/share/icons/hicolor
fi
''; '';
}; };

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

@ -28,23 +28,46 @@ in
bgSupport = true; bgSupport = true;
start = start =
'' ''
# Set GTK_PATH so that GTK+ can find the Xfce theme engine.
export GTK_PATH=${pkgs.xfce.gtk_xfce_engine}/lib/gtk-2.0
# Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes.
export GTK_DATA_PREFIX=${config.system.path}
exec ${pkgs.stdenv.shell} ${pkgs.xfce.xfceutils}/etc/xdg/xfce4/xinitrc exec ${pkgs.stdenv.shell} ${pkgs.xfce.xfceutils}/etc/xdg/xfce4/xinitrc
''; '';
}; };
environment.systemPackages = environment.systemPackages =
[ [
pkgs.gtkLibs.gtk # To get GTK+'s themes.
pkgs.hicolor_icon_theme
pkgs.shared_mime_info
pkgs.which # Needed by the xfce's xinitrc script. pkgs.which # Needed by the xfce's xinitrc script.
pkgs.xfce.exo pkgs.xfce.exo
pkgs.xfce.gtk_xfce_engine
pkgs.xfce.libxfcegui4 # For the icons.
pkgs.xfce.mousepad
pkgs.xfce.ristretto
pkgs.xfce.terminal pkgs.xfce.terminal
pkgs.xfce.thunar
pkgs.xfce.xfce4icontheme
pkgs.xfce.xfce4panel pkgs.xfce.xfce4panel
pkgs.xfce.xfce4session pkgs.xfce.xfce4session
pkgs.xfce.xfce4settings
pkgs.xfce.xfceutils pkgs.xfce.xfceutils
pkgs.xfce.xfconf pkgs.xfce.xfconf
pkgs.xfce.xfdesktop pkgs.xfce.xfdesktop
pkgs.xfce.xfwm4 pkgs.xfce.xfwm4
# This supplies some "abstract" icons such as
# "utilities-terminal" and "accessories-text-editor".
pkgs.gnome.gnomeicontheme
]; ];
environment.pathsToLink =
[ "/share/xfce4" "/share/themes" "/share/mime" ];
}; };
} }