From cb9030b9476ed2abe30f94a811e971a0da842592 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 11 Feb 2010 02:43:45 +0000
Subject: [PATCH] use --with-dbus-daemondir= cause DBUS_DAEMONDIR seems to be
 broken? dbus-launch no longer reports any errors

svn path=/nixpkgs/trunk/; revision=19919
---
 pkgs/development/libraries/dbus/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 85314b725afd..b9d931840761 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -31,7 +31,9 @@ in rec {
   tools = stdenv.mkDerivation {
     name = "dbus-tools-" + version;
 
-    inherit src configureFlags;
+    inherit src;
+
+    configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin";
     
     buildInputs = [pkgconfig expat libs]
       ++ stdenv.lib.optionals useX11 [libX11 libICE libSM];
@@ -39,8 +41,6 @@ in rec {
     postConfigure = "cd tools";
 
     NIX_LDFLAGS = "-ldbus-1";
-    
-    makeFlags = "DBUS_DAEMONDIR=${daemon}/bin";
 
     patchPhase =
       ''