From 057602f3f2e64cf9b01339a4dab5988fbcdf4288 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Aug 2010 18:04:55 +0000 Subject: [PATCH] * Some subdirectories should always be symlinked in the system path when X11 is enabled (e.g. etc/xdg, share/icons...). svn path=/nixos/trunk/; revision=23062 --- modules/services/x11/desktop-managers/kde4.nix | 2 +- modules/services/x11/xserver.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix index 12dea185674b..027d53f76cbf 100644 --- a/modules/services/x11/desktop-managers/kde4.nix +++ b/modules/services/x11/desktop-managers/kde4.nix @@ -67,7 +67,7 @@ in x11Packages = config.environment.kdePackages; - pathsToLink = [ "/etc/xdg" "/share" ]; + pathsToLink = [ "/share" ]; etc = singleton { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index e94dc8dc8a18..ddb6047df215 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -378,7 +378,10 @@ in ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11; environment.systemPackages = config.environment.x11Packages; - + + environment.pathsToLink = + [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; + services.hal.packages = optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions; jobs.xserver =