public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31170 from jbboehr/php-mysqlnd-m

Browse Source 
php: add config.php.mysqlnd option
This commit is contained in:
Orivej Desh 2017-11-11 00:39:04 +00:00 committed by GitHub
commit 4b6f20c56f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/interpreters/php/default.nix
View File

@ -11,6 +11,8 @@ let
let php7 = lib.versionAtLeast version "7.0"; let php7 = lib.versionAtLeast version "7.0";
mysqlHeaders = mysql.lib.dev or mysql; mysqlHeaders = mysql.lib.dev or mysql;
mysqlndSupport = config.php.mysqlnd or false;
mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders;
in composableDerivation.composableDerivation {} (fixed: { in composableDerivation.composableDerivation {} (fixed: {
@ -112,13 +114,13 @@ let
}; };
mysql = { mysql = {
configureFlags = ["--with-mysql"]; configureFlags = ["--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"];
buildInputs = [ mysqlHeaders ]; buildInputs = mysqlBuildInputs;
}; };
mysqli = { mysqli = {
configureFlags = ["--with-mysqli=${mysqlHeaders}/bin/mysql_config"]; configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysqlHeaders}/bin/mysql_config"}"];
buildInputs = [ mysqlHeaders ]; buildInputs = mysqlBuildInputs;
}; };
mysqli_embedded = { mysqli_embedded = {
@ -128,8 +130,8 @@ let
}; };
pdo_mysql = { pdo_mysql = {
configureFlags = ["--with-pdo-mysql=${mysqlHeaders}"]; configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysqlHeaders}"];
buildInputs = [ mysqlHeaders ]; buildInputs = mysqlBuildInputs;
}; };
bcmath = { bcmath = {