diff options
author | Izorkin <izorkin@elven.pw> | 2018-12-14 10:10:00 +0300 |
---|---|---|
committer | Izorkin <izorkin@elven.pw> | 2018-12-14 10:47:44 +0300 |
commit | 0288d43a2d148061850a93cf841d5f1cbb96c89c (patch) | |
tree | 8631e131877df01f59be17bdbc5bdb04d64167d2 | |
parent | 958a6c6dd39b0d6628e1408e798a8f1308f2f3e1 (diff) | |
download | nixlib-0288d43a2d148061850a93cf841d5f1cbb96c89c.tar nixlib-0288d43a2d148061850a93cf841d5f1cbb96c89c.tar.gz nixlib-0288d43a2d148061850a93cf841d5f1cbb96c89c.tar.bz2 nixlib-0288d43a2d148061850a93cf841d5f1cbb96c89c.tar.lz nixlib-0288d43a2d148061850a93cf841d5f1cbb96c89c.tar.xz nixlib-0288d43a2d148061850a93cf841d5f1cbb96c89c.tar.zst nixlib-0288d43a2d148061850a93cf841d5f1cbb96c89c.zip |
php: remove unsupported options
-rw-r--r-- | pkgs/development/interpreters/php/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ae4e9b9635d0..f1e0128abb94 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -2,7 +2,7 @@ { lib, stdenv, fetchurl, flex, bison, autoconf , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype -, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2, libzip }: @@ -17,7 +17,6 @@ let , imapSupport ? config.php.imap or (!stdenv.isDarwin) , ldapSupport ? config.php.ldap or true , mhashSupport ? config.php.mhash or true - , mysqlSupport ? (config.php.mysql or true) , mysqlndSupport ? config.php.mysqlnd or true , mysqliSupport ? config.php.mysqli or true , pdo_mysqlSupport ? config.php.pdo_mysql or true @@ -27,7 +26,6 @@ let , bcmathSupport ? config.php.bcmath or true , socketsSupport ? config.php.sockets or true , curlSupport ? config.php.curl or true - , curlWrappersSupport ? config.php.curlWrappers or true , gettextSupport ? config.php.gettext or true , pcntlSupport ? config.php.pcntl or true , postgresqlSupport ? config.php.postgresql or true @@ -48,7 +46,6 @@ let , ftpSupport ? config.php.ftp or true , fpmSupport ? config.php.fpm or true , gmpSupport ? config.php.gmp or true - , mssqlSupport ? config.php.mssql or (!stdenv.isDarwin) , ztsSupport ? config.php.zts or false , calendarSupport ? config.php.calendar or true , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2") @@ -92,7 +89,6 @@ let ++ optional postgresqlSupport postgresql ++ optional pdo_pgsqlSupport postgresql ++ optional pdo_mysqlSupport mysqlBuildInputs - ++ optional mysqlSupport mysqlBuildInputs ++ optional mysqliSupport mysqlBuildInputs ++ optional gmpSupport gmp ++ optional gettextSupport gettext @@ -100,7 +96,6 @@ let ++ optional xslSupport libxslt ++ optional mcryptSupport libmcrypt' ++ optional bz2Support bzip2 - ++ optional (mssqlSupport && !stdenv.isDarwin) freetds ++ optional sodiumSupport libsodium ++ optional tidySupport html-tidy ++ optional argon2Support libargon2 @@ -130,7 +125,6 @@ let ++ optional embedSupport "--enable-embed" ++ optional mhashSupport "--with-mhash" ++ optional curlSupport "--with-curl=${curl.dev}" - ++ optional curlWrappersSupport "--with-curlwrappers" ++ optional zlibSupport "--with-zlib=${zlib.dev}" ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}" ++ optional pcntlSupport "--enable-pcntl" @@ -139,11 +133,10 @@ let ++ optional postgresqlSupport "--with-pgsql=${postgresql}" ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}" ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}" - ++ optional mysqlSupport "--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}" ++ optionals mysqliSupport [ "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}" ] - ++ optional ( pdo_mysqlSupport || mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock" + ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock" ++ optional bcmathSupport "--enable-bcmath" # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108. ++ optionals gdSupport [ @@ -166,7 +159,6 @@ let ++ optional zipSupport "--enable-zip" ++ optional ftpSupport "--enable-ftp" ++ optional fpmSupport "--enable-fpm" - ++ optional (mssqlSupport && !stdenv.isDarwin) "--with-mssql=${freetds}" ++ optional ztsSupport "--enable-maintainer-zts" ++ optional calendarSupport "--enable-calendar" ++ optional sodiumSupport "--with-sodium=${libsodium.dev}" |