lol

* Build PHP for release

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


svn path=/nixpkgs/trunk/; revision=5191

+7 -1
+4 -1
pkgs/top-level/all-packages.nix
··· 874 874 inherit fetchurl stdenv libsigsegv gettext; 875 875 }; 876 876 877 + # FIXME: unixODBC needs patching on Darwin (see darwinports) 877 878 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; 879 882 }; 880 883 881 884 guile = (import ../development/interpreters/guile) {
+3
pkgs/top-level/build-for-release.nix
··· 82 82 par2cmdline 83 83 parted 84 84 perl 85 + php 85 86 pkgconfig 86 87 postgresql 87 88 postgresql_jdbc ··· 150 151 ;}; 151 152 152 153 powerpcDarwinPkgs = {inherit (allPackages {system = "powerpc-darwin";}) 154 + apacheHttpd 153 155 aterm 154 156 autoconf 155 157 automake19x ··· 162 164 libxslt 163 165 maven 164 166 nxml 167 + php 165 168 subversion 166 169 tetex 167 170 unzip