From fc8204c0e45cc9d748b1650f23f41d7230acdad0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 9 Aug 2010 11:42:32 +0000
Subject: [PATCH] * Always symlink etc/dbus-1 and share/dbus-1 in the system
 path, not   just when KDE is enabled.

svn path=/nixos/trunk/; revision=23053
---
 modules/services/system/dbus.nix               | 2 ++
 modules/services/x11/desktop-managers/kde4.nix | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index fedb5efff06..e083707751a 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -161,6 +161,8 @@ in
         config.system.path
       ];
 
+    environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
+    
   };
  
 }
diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix
index 4b6f770c694..12dea185674 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" "/etc/dbus-1" "/share" ];
+      pathsToLink = [ "/etc/xdg" "/share" ];
 
       etc = singleton
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";