* Revert to DBus 1.0.2; 1.1.20 is broken, it kills the X server when

  you restart the daemon (http://bugs.gentoo.org/show_bug.cgi?id=206509).

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

1 files changed, 4 insertions, 11 deletions

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index c7bf02788bf..b60705f21f6 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -1,18 +1,12 @@
 args: with args;
-
 let
-
-  version = "1.1.20";
-  
+  version = "1.0.2";
   src = fetchurl {
     url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
-    sha256 = "0zhl6cxlwfm9hsl7vm8ycif39805zsa1z8f0qnbfh54jmwccl7vg";
+    sha256 = "1jn652zb81mczsx4rdcwrrzj3lfhx9d107zjfnasc4l5yljl204a";
   };
-  
   configureFlags = "--disable-static --localstatedir=/var --with-session-socket-dir=/tmp";
-  
 in rec {
-
   libs = stdenv.mkDerivation {
     name = "dbus-library-" + version;
     buildInputs = [pkgconfig expat];
@@ -34,16 +28,15 @@ in rec {
     makeFlags = "DBUS_DAEMONDIR=${daemon}/bin";
 
     patchPhase = ''
-      substituteInPlace tools/Makefile.in --replace 'test -z "$(localstatelibdir)"' true
       sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
+      sed -i '/mkdir.*localstate/d' tools/Makefile.in
     '';
   };
 
-  # I'm too lazy to separate daemon and libs now.
+# 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;
-  
 }