public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Build PHP for release

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


svn path=/nixpkgs/trunk/; revision=5191
This commit is contained in:
Martin Bravenboer 2006-04-22 11:19:37 +00:00
parent 67d9dfd583
commit 7f239275aa
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/top-level/all-packages.nix
View File

@ -874,8 +874,11 @@ rec {
inherit fetchurl stdenv libsigsegv gettext; inherit fetchurl stdenv libsigsegv gettext;
}; };
# FIXME: unixODBC needs patching on Darwin (see darwinports)
php = (import ../development/interpreters/php) { 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) { guile = (import ../development/interpreters/guile) {

3
pkgs/top-level/build-for-release.nix
View File

@ -82,6 +82,7 @@ let {
par2cmdline par2cmdline
parted parted
perl perl
php
pkgconfig pkgconfig
postgresql postgresql
postgresql_jdbc postgresql_jdbc
@ -150,6 +151,7 @@ let {
;}; ;};
powerpcDarwinPkgs = {inherit (allPackages {system = "powerpc-darwin";}) powerpcDarwinPkgs = {inherit (allPackages {system = "powerpc-darwin";})
apacheHttpd
aterm aterm
autoconf autoconf
automake19x automake19x
@ -162,6 +164,7 @@ let {
libxslt libxslt
maven maven
nxml nxml
php
subversion subversion
tetex tetex
unzip unzip