Merge pull request #82643 from etu/php-exts-pdo-odbc

phpPackages.exts.pdo_odbc: init for all versions of php
This commit is contained in:
Elis Hirwing 2020-03-15 19:50:35 +01:00 committed by GitHub
commit a0cb913949
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,7 +2,7 @@
, bzip2, curl, libxml2, openssl, gmp5, icu, oniguruma, libsodium, html-tidy
, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl, uwimap
, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng, freetype
, libffi, freetds, postgresql, sqlite, recode, net-snmp }:
, libffi, freetds, postgresql, sqlite, recode, net-snmp, unixODBC }:
let
self = with self; {
@ -704,11 +704,13 @@ let
# Name passed is the name of the extension and is automatically used
# to add the configureFlag "--enable-${name}", which can be overriden.
#
# Build inputs is used for extra deps that may be needed.
# Build inputs is used for extra deps that may be needed. And zendExtension
# will mark the extension as a zend extension or not.
mkExtension = {
name
, configureFlags ? [ "--enable-${name}" ]
, buildInputs ? []
, zendExtension ? false
, ...
}: stdenv.mkDerivation {
pname = "php-ext-${name}";
@ -718,7 +720,7 @@ let
enableParallelBuilding = true;
nativeBuildInputs = [ php autoconf pkgconfig re2c ];
inherit configureFlags buildInputs;
inherit configureFlags buildInputs zendExtension;
preConfigure = "phpize";
@ -811,7 +813,7 @@ let
{ name = "mysqli"; configureFlags = [ "--with-mysqli=mysqlnd" "--with-mysql-sock=/run/mysqld/mysqld.sock" ]; }
# oci8 (7.4, 7.3, 7.2)
# odbc (7.4, 7.3, 7.2)
{ name = "opcache"; buildInputs = [ pcre' ]; }
{ name = "opcache"; buildInputs = [ pcre' ]; zendExtension = true; }
{ name = "pcntl"; }
{ name = "pdo"; }
{ name = "pdo_dblib";
@ -821,7 +823,7 @@ let
# pdo_firebird (7.4, 7.3, 7.2)
{ name = "pdo_mysql"; configureFlags = [ "--with-pdo-mysql=mysqlnd" ]; }
# pdo_oci (7.4, 7.3, 7.2)
# pdo_odbc (7.4, 7.3, 7.2)
{ name = "pdo_odbc"; configureFlags = [ "--with-pdo-odbc=unixODBC,${unixODBC}" ]; }
{ name = "pdo_pgsql"; configureFlags = [ "--with-pdo-pgsql=${postgresql}" ]; }
{ name = "pdo_sqlite"; buildInputs = [ sqlite ]; configureFlags = [ "--with-pdo-sqlite=${sqlite.dev}" ]; }
{ name = "pgsql"; buildInputs = [ pcre' ]; configureFlags = [ "--with-pgsql=${postgresql}" ]; }