php53: add imap option

authored by Jason \"Don\" O'Conal and committed by Rok Garbas 1f9005a3 9007e57f

+11 -14
+8 -13
pkgs/development/interpreters/php/5.3.nix
··· 1 { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison 2 , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext 3 , openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype, libxslt 4 - , libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv }: 5 6 let 7 libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; ··· 132 buildInputs = [gettext]; 133 }; 134 135 intl = { 136 configureFlags = ["--enable-intl"]; 137 buildInputs = [icu]; ··· 163 ftp = { 164 configureFlags = ["--enable-ftp"]; 165 }; 166 - 167 - /* 168 - php is build within this derivation in order to add the xdebug lines to the php.ini. 169 - So both Apache and command line php both use xdebug without having to configure anything. 170 - Xdebug could be put in its own derivation. 171 - * / 172 - meta = { 173 - description = "debugging support for PHP"; 174 - homepage = http://xdebug.org; 175 - license = "based on the PHP license - as is"; 176 - }; 177 - */ 178 }; 179 180 cfg = { ··· 186 ftpSupport = config.php.ftp or true; 187 gdSupport = config.php.gd or true; 188 gettextSupport = config.php.gettext or true; 189 intlSupport = config.php.intl or true; 190 libxml2Support = config.php.libxml2 or true; 191 mbstringSupport = config.php.mbstring or true;
··· 1 { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison 2 , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext 3 , openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype, libxslt 4 + , libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv, uwimap 5 + , pam }: 6 7 let 8 libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; ··· 133 buildInputs = [gettext]; 134 }; 135 136 + imap = { 137 + configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]; 138 + buildInputs = [ uwimap openssl pam ]; 139 + }; 140 + 141 intl = { 142 configureFlags = ["--enable-intl"]; 143 buildInputs = [icu]; ··· 169 ftp = { 170 configureFlags = ["--enable-ftp"]; 171 }; 172 }; 173 174 cfg = { ··· 180 ftpSupport = config.php.ftp or true; 181 gdSupport = config.php.gd or true; 182 gettextSupport = config.php.gettext or true; 183 + imapSupport = config.php.imap or false; 184 intlSupport = config.php.intl or true; 185 libxml2Support = config.php.libxml2 or true; 186 mbstringSupport = config.php.mbstring or true;
+3 -1
pkgs/tools/networking/uwimap/default.nix
··· 8 sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak"; 9 }; 10 11 - makeFlags = "lnp"; # Linux with PAM modules 12 13 buildInputs = [ pam openssl ]; 14
··· 8 sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak"; 9 }; 10 11 + makeFlags = "lnp" # Linux with PAM modules 12 + # -fPIC is required to compile php with imap on x86_64 systems 13 + + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC"; 14 15 buildInputs = [ pam openssl ]; 16