From c264b316b1eeaadd15ee0e7ba11b78a2deff88c9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 8 Feb 2008 10:39:20 +0000
Subject: [PATCH] Some updates. Now I can build system at least with some
 settings.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10551
---
 pkgs/development/libraries/dbus/default.nix | 4 ++++
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 98fb6c682b1..b60705f21f6 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -35,4 +35,8 @@ in rec {
 
 # 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 6d6add025c8..0f211793b1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1347,7 +1347,7 @@ rec {
   php = (import ../development/interpreters/php_configurable) {
    inherit mkDerivationByConfiguration stdenv mysql lib;
    inherit fetchurl flex bison apacheHttpd; # gettext;
-   inherit libxml2;
+   inherit libxml2 automake autoconf postgresql;
    flags = [ "xdebug" "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
   };