From 65deea661027b80ea6098956eeb0a91a6da8f522 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Mar 2008 14:58:48 +0000
Subject: [PATCH] * dbus-uuidgen is now in dbus.tools.  Also, a quick hack to
 get   DBus clients working again: they expect dbus-launch in the  
 dbus.daemon prefix, where it no longer is.  Fortunately they   also search in
 the path.  But a better fix is to move dbus-launch   to dbus.daemon.

svn path=/nixos/trunk/; revision=10951
---
 upstart-jobs/dbus.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upstart-jobs/dbus.nix b/upstart-jobs/dbus.nix
index d57b032524d..a2893d42ecf 100644
--- a/upstart-jobs/dbus.nix
+++ b/upstart-jobs/dbus.nix
@@ -33,7 +33,7 @@ in
     }
   ];
   
-  extraPath = [dbus];
+  extraPath = [dbus.daemon dbus.tools];
   
   job = "
 description \"D-Bus system message bus daemon\"
@@ -47,7 +47,7 @@ start script
     chown messagebus ${homeDir}
 
     mkdir -m 0755 -p /var/lib/dbus
-    ${dbus}/bin/dbus-uuidgen --ensure
+    ${dbus.tools}/bin/dbus-uuidgen --ensure
 
 end script