From 6f04e6a5d688b7d5a7287e489c583743727f6d45 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 30 Oct 2009 12:36:32 +0000
Subject: [PATCH] * Merge the temporary copy of dbus.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18052
---
 pkgs/development/libraries/dbus/default.nix | 22 ++++----
 pkgs/development/libraries/dbus/temp.nix    | 58 ---------------------
 pkgs/top-level/all-packages.nix             |  7 ---
 3 files changed, 13 insertions(+), 74 deletions(-)
 delete mode 100644 pkgs/development/libraries/dbus/temp.nix

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index f3fa4c98ca11..85314b725afd 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -8,7 +8,7 @@ let
     sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln";
   };
   
-  configureFlags = "--localstatedir=/var --with-session-socket-dir=/tmp";
+  configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
   
 in rec {
 
@@ -19,10 +19,13 @@ in rec {
     
     inherit src configureFlags;
     
-    patchPhase = ''
-      sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
-      sed -i '/SUBDIRS/s/ tools//' Makefile.in
-    '';
+    patchPhase =
+      ''
+        sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
+        sed -i '/SUBDIRS/s/ tools//' Makefile.in
+      '';
+
+    installFlags = "sysconfdir=$(out)/etc";
   };
 
   tools = stdenv.mkDerivation {
@@ -39,10 +42,11 @@ in rec {
     
     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:'
-    '';
+    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.
diff --git a/pkgs/development/libraries/dbus/temp.nix b/pkgs/development/libraries/dbus/temp.nix
deleted file mode 100644
index 85314b725afd..000000000000
--- a/pkgs/development/libraries/dbus/temp.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{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;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d2f174b824d..94f834b37f65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3222,13 +3222,6 @@ 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 = makeOverridable (import ../development/libraries/dbus-glib) {
     inherit fetchurl stdenv pkgconfig gettext dbus expat glib;
   };