diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-25 18:00:48 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-25 18:11:38 +0100 |
| commit | cb30150bd5dd728e2cd9b9b2870cf6f3424d4261 (patch) | |
| tree | c5f74c7298aef8822e981ee4dfab9b47709941fa | |
| parent | 2262763b1a52ae383deeee3b062dd13e5721dbd1 (diff) | |
| download | nixpkgs-cb30150bd5dd728e2cd9b9b2870cf6f3424d4261.tar nixpkgs-cb30150bd5dd728e2cd9b9b2870cf6f3424d4261.tar.gz nixpkgs-cb30150bd5dd728e2cd9b9b2870cf6f3424d4261.tar.bz2 nixpkgs-cb30150bd5dd728e2cd9b9b2870cf6f3424d4261.tar.lz nixpkgs-cb30150bd5dd728e2cd9b9b2870cf6f3424d4261.tar.xz nixpkgs-cb30150bd5dd728e2cd9b9b2870cf6f3424d4261.tar.zst nixpkgs-cb30150bd5dd728e2cd9b9b2870cf6f3424d4261.zip | |
php: fix build in case mysql is not mariadb
fixes #20986
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index c261668edd2..b7777d55667 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -9,9 +9,10 @@ let generic = { version, sha256 }: - let php7 = lib.versionAtLeast version "7.0"; in + let php7 = lib.versionAtLeast version "7.0"; + mysqlHeaders = mysql.lib.dev or mysql; - composableDerivation.composableDerivation {} (fixed: { + in composableDerivation.composableDerivation {} (fixed: { inherit version; @@ -114,12 +115,12 @@ let mysql = { configureFlags = ["--with-mysql"]; - buildInputs = [ mysql.lib.dev ]; + buildInputs = [ mysqlHeaders ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql.lib.dev}/bin/mysql_config"]; - buildInputs = [ mysql.lib.dev ]; + configureFlags = ["--with-mysqli=${mysqlHeaders}/bin/mysql_config"]; + buildInputs = [ mysqlHeaders ]; }; mysqli_embedded = { @@ -129,8 +130,8 @@ let }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql.lib.dev}"]; - buildInputs = [ mysql.lib.dev ]; + configureFlags = ["--with-pdo-mysql=${mysqlHeaders}"]; + buildInputs = [ mysqlHeaders ]; }; bcmath = { |