about summary refs log tree commit diff
path: root/pkgs/development/libraries/dbus
diff options
context:
space:
mode:
authorMarc Weber <marco-oweber@gmx.de>2010-02-11 02:43:45 +0000
committerMarc Weber <marco-oweber@gmx.de>2010-02-11 02:43:45 +0000
commitcb9030b9476ed2abe30f94a811e971a0da842592 (patch)
tree75e8c524a72ed315635b353f0442d293bc860ee3 /pkgs/development/libraries/dbus
parentef9ef781eaa763043e798e06031debb447279bcf (diff)
downloadnixlib-cb9030b9476ed2abe30f94a811e971a0da842592.tar
nixlib-cb9030b9476ed2abe30f94a811e971a0da842592.tar.gz
nixlib-cb9030b9476ed2abe30f94a811e971a0da842592.tar.bz2
nixlib-cb9030b9476ed2abe30f94a811e971a0da842592.tar.lz
nixlib-cb9030b9476ed2abe30f94a811e971a0da842592.tar.xz
nixlib-cb9030b9476ed2abe30f94a811e971a0da842592.tar.zst
nixlib-cb9030b9476ed2abe30f94a811e971a0da842592.zip
use --with-dbus-daemondir= cause DBUS_DAEMONDIR seems to be broken?
dbus-launch no longer reports any errors

svn path=/nixpkgs/trunk/; revision=19919
Diffstat (limited to 'pkgs/development/libraries/dbus')
-rw-r--r--pkgs/development/libraries/dbus/default.nix6
1 files 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 =
       ''