From ad17a6dce3f0649c31db7fc60cad98c3cbafc102 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Nov 2009 22:44:40 +0000
Subject: [PATCH] * Changes related to the xorg-7.5 merge.

svn path=/nixos/trunk/; revision=18126
---
 doc/manual/default.nix           | 2 +-
 modules/services/system/dbus.nix | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index f0e6b64103c2..54301dadf444 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -25,7 +25,7 @@ let
 
     sources = pkgs.lib.sourceFilesBySuffices ./. [".xml"];
 
-    buildInputs = [pkgs.libxml2New pkgs.libxslt];
+    buildInputs = [pkgs.libxml2 pkgs.libxslt];
 
     xsltFlags = ''
       --param section.autolabel 1
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 4011c3b3335d..8e1d9bd4d10b 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -7,8 +7,7 @@ let
 
   cfg = config.services.dbus;
 
-  # !!! dbus_temp uses /etc/dbus-1; will be merged into pkgs.dbus later.
-  dbus = pkgs.dbus_temp;
+  inherit (pkgs) dbus;
 
   homeDir = "/var/run/dbus";