natalie
/
nixpkgs-custom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #47227 from flokli/php-mysql-sock-18.03 

php: set mysql socket path if mysql[i] or pdo_mysql support is enabled
release-18.03-flake
Jörg Thalheim 2018-09-24 01:42:43 +01:00 committed by GitHub
parent efd74a6575 19765ecfb3
commit 8e41b9fb41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,12 +115,14 @@ let
};
mysql = {
configureFlags = ["--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"];
configureFlags = ["--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"
"--with-mysql-sock=/run/mysqld/mysqld.sock"];
buildInputs = mysqlBuildInputs;
};
mysqli = {
configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"];
configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
"--with-mysql-sock=/run/mysqld/mysqld.sock"];
buildInputs = mysqlBuildInputs;
};
@ -131,7 +133,8 @@ let
};
pdo_mysql = {
configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"];
configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"
"--with-mysql-sock=/run/mysqld/mysqld.sock"];
buildInputs = mysqlBuildInputs;
};