diff options
| author | Elis Hirwing <elis@hirwing.se> | 2022-10-03 10:25:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 10:25:21 +0200 |
| commit | ecf0f7686607418b256db6e63c9ce59a432c86c8 (patch) | |
| tree | 6210d05a2dfd294642a49e29f59544e37f700bfe | |
| parent | fd54651f5ffb4a36e8463e0c327a78442b26cbe7 (diff) | |
| parent | d81b7507f0b40f3137f3b611b963ea5ddb4b14a3 (diff) | |
| download | nixlib-ecf0f7686607418b256db6e63c9ce59a432c86c8.tar nixlib-ecf0f7686607418b256db6e63c9ce59a432c86c8.tar.gz nixlib-ecf0f7686607418b256db6e63c9ce59a432c86c8.tar.bz2 nixlib-ecf0f7686607418b256db6e63c9ce59a432c86c8.tar.lz nixlib-ecf0f7686607418b256db6e63c9ce59a432c86c8.tar.xz nixlib-ecf0f7686607418b256db6e63c9ce59a432c86c8.tar.zst nixlib-ecf0f7686607418b256db6e63c9ce59a432c86c8.zip | |
Merge pull request #193925 from drupol/php/enable-imap-ext
php: enable `imap` extension by default
| -rw-r--r-- | pkgs/development/interpreters/php/8.0.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/8.1.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index c58c79415d40..97ef232135ec 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -21,6 +21,7 @@ base.withExtensions ({ all, ... }: with all; ([ gettext gmp iconv + imap intl ldap mbstring @@ -49,4 +50,4 @@ base.withExtensions ({ all, ... }: with all; ([ xmlwriter zip zlib -] ++ lib.optionals (!stdenv.isDarwin) [ imap ])) +])) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index aa190bc3866c..7e73787256d2 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -21,6 +21,7 @@ base.withExtensions ({ all, ... }: with all; ([ gettext gmp iconv + imap intl ldap mbstring @@ -49,4 +50,4 @@ base.withExtensions ({ all, ... }: with all; ([ xmlwriter zip zlib -] ++ lib.optionals (!stdenv.isDarwin) [ imap ])) +])) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 2be63015122f..e5eb38c32e44 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -22,6 +22,7 @@ , libffi , libiconv , libjpeg +, libkrb5 , libpng , libsodium , libwebp @@ -342,10 +343,8 @@ lib.makeScope pkgs.newScope (self: with self; { } { name = "imap"; - buildInputs = [ uwimap openssl pam pcre2 ]; - configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]; - # uwimap doesn't build on darwin. - enable = (!stdenv.isDarwin); + buildInputs = [ uwimap openssl pam pcre2 libkrb5 ]; + configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" "--with-kerberos" ]; } { name = "intl"; |