* Changes related to the xorg-7.5 merge.

svn path=/nixos/trunk/; revision=18126
2009-11-04 22:44:40 +00:00 · 2009-11-04 22:44:40 +00:00 · ad17a6dce3
commit ad17a6dce3
parent 3f7eb694a9
2 changed files with 2 additions and 3 deletions
--- 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
--- 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";