cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5601 from robberer/tmp1

Browse source 
php: add optional ZTS support and new PECL module pthreads
This commit is contained in:
lethalman 2015-01-08 13:22:08 +01:00
commit 7665a97d06
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/interpreters/php/5.4.nix
View file

@ -185,6 +185,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
buildInputs = [freetds];
};
zts = {
configureFlags = ["--enable-maintainer-zts"];
};
/*
php is build within this derivation in order to add the xdebug lines to the php.ini.
So both Apache and command line php both use xdebug without having to configure anything.
@ -224,6 +228,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
ftpSupport = config.php.ftp or true;
fpmSupport = config.php.fpm or true;
mssqlSupport = config.php.mssql or (!stdenv.isDarwin);
ztsSupport = config.php.zts or false;
};
configurePhase = ''

8
pkgs/top-level/php-packages.nix
View file

@ -78,4 +78,12 @@ let self = with self; {
buildInputs = [ pkgs.m4 ];
};
pthreads = assert pkgs.config.php.zts or false; buildPecl {
#pthreads requires a build of PHP with ZTS (Zend Thread Safety) enabled
#--enable-maintainer-zts or --enable-zts on Windows
name = "pthreads-2.0.10";
sha256 = "1xlcb1b1g10jd0xhm3c01a06yqpb5qln47pd1k522138324qvpwb";
};
}; in self