From 41cd4f2459d63c5ad19a227c3dd5d7704df6161c Mon Sep 17 00:00:00 2001 From: John Boehr Date: Thu, 2 Nov 2017 18:49:20 -0700 Subject: php: add config.php.mysqlnd option --- pkgs/development/interpreters/php/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index c967ed2b8623..0ef1c492d588 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -11,6 +11,8 @@ let let php7 = lib.versionAtLeast version "7.0"; mysqlHeaders = mysql.lib.dev or mysql; + mysqlndSupport = config.php.mysqlnd or false; + mysqlBuildInputs = if mysqlndSupport then [] else [ mysqlHeaders ]; in composableDerivation.composableDerivation {} (fixed: { @@ -110,13 +112,13 @@ let }; mysql = { - configureFlags = ["--with-mysql"]; - buildInputs = [ mysqlHeaders ]; + configureFlags = ["--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"]; + buildInputs = mysqlBuildInputs; }; mysqli = { - configureFlags = ["--with-mysqli=${mysqlHeaders}/bin/mysql_config"]; - buildInputs = [ mysqlHeaders ]; + configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysqlHeaders}/bin/mysql_config"}"]; + buildInputs = mysqlBuildInputs; }; mysqli_embedded = { @@ -126,8 +128,8 @@ let }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysqlHeaders}"]; - buildInputs = [ mysqlHeaders ]; + configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysqlHeaders}"]; + buildInputs = mysqlBuildInputs; }; bcmath = { -- cgit 1.4.1 From 1cff740488834d1c91328f00c727bfb15f6f3afa Mon Sep 17 00:00:00 2001 From: John Boehr Date: Thu, 9 Nov 2017 00:14:27 -0800 Subject: Apply changes recommended by @Mic92 --- pkgs/development/interpreters/php/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7be3cbd5effa..de8ab8b71813 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -12,7 +12,7 @@ let let php7 = lib.versionAtLeast version "7.0"; mysqlHeaders = mysql.lib.dev or mysql; mysqlndSupport = config.php.mysqlnd or false; - mysqlBuildInputs = if mysqlndSupport then [] else [ mysqlHeaders ]; + mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders; in composableDerivation.composableDerivation {} (fixed: { -- cgit 1.4.1