* Build PHP for release
* Disable ODBC support on Darwin; unixODBC needs patching on Darwin.
svn path=/nixpkgs/trunk/; revision=5191
commit7f239275aa26063bbe38d715023100b15b5f15af
authorMartin Bravenboer <martin.bravenboer@logicblox.com>
dateSat 22 Apr 2006, 11:19 (21 years ago)
parent67d9dfd
pkgs/top-level/all-packages.nix+4−1
@@ -874,8 +874,11 @@ rec {
874874 inherit fetchurl stdenv libsigsegv gettext;
875875 };
876876
877+ # FIXME: unixODBC needs patching on Darwin (see darwinports)
877878 php = (import ../development/interpreters/php) {
878− inherit stdenv fetchurl flex bison libxml2 apacheHttpd unixODBC;
879+ inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
880+ unixODBC =
881+ if stdenv.system == "powerpc-darwin" then null else unixODBC;
879882 };
880883
881884 guile = (import ../development/interpreters/guile) {
pkgs/top-level/build-for-release.nix+3
@@ -82,6 +82,7 @@ let {
8282 par2cmdline
8383 parted
8484 perl
85+ php
8586 pkgconfig
8687 postgresql
8788 postgresql_jdbc
@@ -150,6 +151,7 @@ let {
150151 ;};
151152
152153 powerpcDarwinPkgs = {inherit (allPackages {system = "powerpc-darwin";})
154+ apacheHttpd
153155 aterm
154156 autoconf
155157 automake19x
@@ -162,6 +164,7 @@ let {
162164 libxslt
163165 maven
164166 nxml
167+ php
165168 subversion
166169 tetex
167170 unzip