From 7f239275aa26063bbe38d715023100b15b5f15af Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Sat, 22 Apr 2006 11:19:37 +0000
Subject: [PATCH] * Build PHP for release

* Disable ODBC support on Darwin; unixODBC needs patching on Darwin.


svn path=/nixpkgs/trunk/; revision=5191
---
 pkgs/top-level/all-packages.nix      | 5 ++++-
 pkgs/top-level/build-for-release.nix | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88ff15fe9b2..7de376fd332 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -874,8 +874,11 @@ rec {
     inherit fetchurl stdenv libsigsegv gettext;
   };
 
+  # FIXME: unixODBC needs patching on Darwin (see darwinports)
   php = (import ../development/interpreters/php) {
-    inherit stdenv fetchurl flex bison libxml2 apacheHttpd unixODBC;
+    inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
+    unixODBC =
+      if stdenv.system == "powerpc-darwin" then null else unixODBC;
   };
 
   guile = (import ../development/interpreters/guile) {
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index ab5ad626653..b6546e2026d 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -82,6 +82,7 @@ let {
     par2cmdline
     parted
     perl
+    php
     pkgconfig
     postgresql
     postgresql_jdbc
@@ -150,6 +151,7 @@ let {
   ;};
 
   powerpcDarwinPkgs = {inherit (allPackages {system = "powerpc-darwin";})
+    apacheHttpd
     aterm
     autoconf
     automake19x
@@ -162,6 +164,7 @@ let {
     libxslt
     maven
     nxml
+    php
     subversion
     tetex
     unzip