diff options
author | Robin Gloster <mail@glob.in> | 2017-12-28 17:50:27 +0100 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
commit | 48464d620dfe4646fd44829cb77ca6fd327e98f9 (patch) | |
tree | a90e1a9eb5519cb5f0ff059a56ba8317d5375707 /pkgs/development | |
parent | 1f4c02fc9ee89995fa8fa87c99f840514234db9a (diff) | |
download | nixlib-48464d620dfe4646fd44829cb77ca6fd327e98f9.tar nixlib-48464d620dfe4646fd44829cb77ca6fd327e98f9.tar.gz nixlib-48464d620dfe4646fd44829cb77ca6fd327e98f9.tar.bz2 nixlib-48464d620dfe4646fd44829cb77ca6fd327e98f9.tar.lz nixlib-48464d620dfe4646fd44829cb77ca6fd327e98f9.tar.xz nixlib-48464d620dfe4646fd44829cb77ca6fd327e98f9.tar.zst nixlib-48464d620dfe4646fd44829cb77ca6fd327e98f9.zip |
php: clean up mysql/mariadb handling
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/php/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index e397f4af297b..3eedf19a312b 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -12,9 +12,8 @@ let { version, sha256 }: let php7 = lib.versionAtLeast version "7.0"; - mysqlHeaders = mysql.connector-c or mysql; mysqlndSupport = config.php.mysqlnd or false; - mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders; + mysqlBuildInputs = lib.optional (!mysqlndSupport) mysql.connector-c; in composableDerivation.composableDerivation {} (fixed: { @@ -121,7 +120,7 @@ let }; mysqli = { - configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysqlHeaders}/bin/mysql_config"}"]; + configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"]; buildInputs = mysqlBuildInputs; }; @@ -132,7 +131,7 @@ let }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysqlHeaders}"]; + configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"]; buildInputs = mysqlBuildInputs; }; |