git.iko.soy/typeable/nixpkgs
on master help sign in
* Build PHP for release
7f23927Martin Bravenboer
pkgs/top-level/all-packages.nix+4−1
compare with master
unifiedsplit
@@ -874,8 +874,11 @@ rec {
874 inherit fetchurl stdenv libsigsegv gettext;
874 inherit fetchurl stdenv libsigsegv gettext;
875 };
875 };
876
876
877+ # FIXME: unixODBC needs patching on Darwin (see darwinports)
877 php = (import ../development/interpreters/php) {
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 guile = (import ../development/interpreters/guile) {
884 guile = (import ../development/interpreters/guile) {
pkgs/top-level/build-for-release.nix+3
@@ -82,6 +82,7 @@ let {
82 par2cmdline
82 par2cmdline
83 parted
83 parted
84 perl
84 perl
85+ php
85 pkgconfig
86 pkgconfig
86 postgresql
87 postgresql
87 postgresql_jdbc
88 postgresql_jdbc
@@ -150,6 +151,7 @@ let {
150 ;};
151 ;};
151
152
152 powerpcDarwinPkgs = {inherit (allPackages {system = "powerpc-darwin";})
153 powerpcDarwinPkgs = {inherit (allPackages {system = "powerpc-darwin";})
154+ apacheHttpd
153 aterm
155 aterm
154 autoconf
156 autoconf
155 automake19x
157 automake19x
@@ -162,6 +164,7 @@ let {
162 libxslt
164 libxslt
163 maven
165 maven
164 nxml
166 nxml
167+ php
165 subversion
168 subversion
166 tetex
169 tetex
167 unzip
170 unzip