* dbus: get the configuration from /etc/dbus-1. It's purer to use a

command-line argument when starting the system bus daemon, but
  unfortunately dbus-daemon-launch-helper is started with an empty
  environment and no way to override the compile-time location of the
  configuration file.

  I've made a temporary copy of dbus since lots of things depend on it
  and I don't want a big recompile.

svn path=/nixpkgs/trunk/; revision=16735

pkgs/development/libraries/dbus/temp.nix

@@ -0,0 +1,58 @@
+{stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true}:
+
+let
+  version = "1.2.16";
+  
+  src = fetchurl {
+    url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
+    sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln";
+  };
+  
+  configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
+  
+in rec {
+
+  libs = stdenv.mkDerivation {
+    name = "dbus-library-" + version;
+    
+    buildInputs = [pkgconfig expat];
+    
+    inherit src configureFlags;
+    
+    patchPhase =
+      ''
+        sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
+        sed -i '/SUBDIRS/s/ tools//' Makefile.in
+      '';
+
+    installFlags = "sysconfdir=$(out)/etc";
+  };
+
+  tools = stdenv.mkDerivation {
+    name = "dbus-tools-" + version;
+
+    inherit src configureFlags;
+    
+    buildInputs = [pkgconfig expat libs]
+      ++ stdenv.lib.optionals useX11 [libX11 libICE libSM];
+      
+    postConfigure = "cd tools";
+
+    NIX_LDFLAGS = "-ldbus-1";
+    
+    makeFlags = "DBUS_DAEMONDIR=${daemon}/bin";
+
+    patchPhase =
+      ''
+        sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
+        substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
+      '';
+  };
+
+  # I'm too lazy to separate daemon and libs now.
+  daemon = libs;
+  
+  # FIXME TODO
+  # After merger it will be better to correct upstart-job instead.
+  outPath = daemon.outPath;
+}

pkgs/top-level/all-packages.nix

@@ -2927,6 +2927,13 @@ let
     useX11 = true; # !!! `false' doesn't build
   };
 
+  # !!! temporary fork; will replace dbus soon.
+  dbus_temp = import ../development/libraries/dbus/temp.nix {
+    inherit fetchurl stdenv pkgconfig expat;
+    inherit (xlibs) libX11 libICE libSM;
+    useX11 = true; # !!! `false' doesn't build
+  };
+
   dbus_glib = import ../development/libraries/dbus-glib {
     inherit fetchurl stdenv pkgconfig gettext dbus expat;
     inherit (gtkLibs) glib;