diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
| commit | f8a8fc6c7c079de430fa528f688ddac781bcef16 (patch) | |
| tree | 08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/development/interpreters/php | |
| parent | 6be720b3a756662bb31adfdc1948553a02057c16 (diff) | |
| download | nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.gz nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.bz2 nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.lz nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.xz nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.zst nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.zip | |
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions.
Diffstat (limited to 'pkgs/development/interpreters/php')
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 508339d0da6..9a82868b7b3 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,6 +1,6 @@ # pcre functionality is tested in nixos/tests/php-pcre.nix { lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c -, libmysqlclient, libxml2, readline, zlib, curl, postgresql, gettext +, mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2 @@ -64,7 +64,7 @@ let }: let - mysqlBuildInputs = optional (!mysqlndSupport) libmysqlclient; + mysqlBuildInputs = optional (!mysqlndSupport) mysql.connector-c; libmcrypt' = libmcrypt.override { disablePosixThreads = true; }; in stdenv.mkDerivation { @@ -149,9 +149,9 @@ let ++ optional postgresqlSupport "--with-pgsql=${postgresql}" ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}" ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}" - ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else libmysqlclient}" + ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}" ++ optionals mysqliSupport [ - "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${libmysqlclient}/bin/mysql_config"}" + "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}" ] ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock" ++ optional bcmathSupport "--enable-bcmath" |