* Build PHP for release
* Disable ODBC support on Darwin; unixODBC needs patching on Darwin. svn path=/nixpkgs/trunk/; revision=5191
This commit is contained in:
parent
67d9dfd583
commit
7f239275aa
|
@ -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) {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue