Author: urkud
Date: Wed Sep 7 23:07:05 2011
New Revision: 29106
URL: https://svn.nixos.org/websvn/nix/?rev=29106&sc=1
Log:
Preserve <standard_session_service_dirs/> in dbus.conf
This way *session* dbus daemon loads services from XDG_DATA_DIRS
Modified:
nixos/trunk/modules/services/system/dbus.nix
Modified: nixos/trunk/modules/services/system/dbus.nix
==============================================================================
--- nixos/trunk/modules/services/system/dbus.nix Wed Sep 7 22:53:31
2011 (r29105)
+++ nixos/trunk/modules/services/system/dbus.nix Wed Sep 7 23:07:05
2011 (r29106)
@@ -35,7 +35,7 @@
# Add the services and session.d directories to the session bus
# search path.
sed -i $out/session.conf \
- -e 's|<standard_session_servicedirs />|${sessionServiceDirs}|' \
+ -e 's|<standard_session_servicedirs />|${sessionServiceDirs}&|' \
-e 's|<includedir>session.d</includedir>|${sessionIncludeDirs}|'
''; # */
};
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
