diff options
author | Jason \"Don\" O'Conal <lovek323@gmail.com> | 2013-07-14 11:47:14 +1000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-07-28 09:41:58 +0200 |
commit | b4105cfaff70e88058c179b0f9cac87af6e034fe (patch) | |
tree | ed3479ff59188c5700a77bae04d9bd548ac97cf8 /pkgs/development | |
parent | 5b4e0207ba57e100c3cbd78b8ffe2884a1ff3097 (diff) | |
download | nixlib-b4105cfaff70e88058c179b0f9cac87af6e034fe.tar nixlib-b4105cfaff70e88058c179b0f9cac87af6e034fe.tar.gz nixlib-b4105cfaff70e88058c179b0f9cac87af6e034fe.tar.bz2 nixlib-b4105cfaff70e88058c179b0f9cac87af6e034fe.tar.lz nixlib-b4105cfaff70e88058c179b0f9cac87af6e034fe.tar.xz nixlib-b4105cfaff70e88058c179b0f9cac87af6e034fe.tar.zst nixlib-b4105cfaff70e88058c179b0f9cac87af6e034fe.zip |
php53: fix build on darwin (close #748)
* add empty unix.h header * build with kerberos * ensure the binary has no extension
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/php-xdebug/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/interpreters/php/5.3.nix | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix index fe7bbb869da8..99c5ad663af4 100644 --- a/pkgs/development/interpreters/php-xdebug/default.nix +++ b/pkgs/development/interpreters/php-xdebug/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { configurePhase = '' phpize ./configure --prefix=$out + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # looks for this file for some reason -- isn't needed + touch unix.h ''; buildPhase = '' diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index a84927a20f3d..caa673b31a92 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -134,8 +134,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; imap = { - configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]; - buildInputs = [ uwimap openssl pam ]; + configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ] + # uwimap builds with kerberos on darwin + ++ stdenv.lib.optional (stdenv.isDarwin) "--with-kerberos"; + buildInputs = [ uwimap openssl ] + ++ stdenv.lib.optional (!stdenv.isDarwin) pam; }; intl = { @@ -205,6 +208,9 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags echo configurePhase end + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # don't build php.dSYM as the php binary + sed -i 's/EXEEXT = \.dSYM/EXEEXT =/' Makefile ''; installPhase = '' |