diff options
author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-04-22 11:19:37 +0000 |
---|---|---|
committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-04-22 11:19:37 +0000 |
commit | 7f239275aa26063bbe38d715023100b15b5f15af (patch) | |
tree | 48532d499044fdd3236548cccba757d64dc4679f /pkgs/top-level/all-packages.nix | |
parent | 67d9dfd58311c21ba932c7f754f0a311541340d7 (diff) | |
download | nixpkgs-7f239275aa26063bbe38d715023100b15b5f15af.tar nixpkgs-7f239275aa26063bbe38d715023100b15b5f15af.tar.gz nixpkgs-7f239275aa26063bbe38d715023100b15b5f15af.tar.bz2 nixpkgs-7f239275aa26063bbe38d715023100b15b5f15af.tar.lz nixpkgs-7f239275aa26063bbe38d715023100b15b5f15af.tar.xz nixpkgs-7f239275aa26063bbe38d715023100b15b5f15af.tar.zst nixpkgs-7f239275aa26063bbe38d715023100b15b5f15af.zip |
* Build PHP for release
* Disable ODBC support on Darwin; unixODBC needs patching on Darwin. svn path=/nixpkgs/trunk/; revision=5191
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 4 insertions, 1 deletions
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) { |