Remove misconfigured mcrypt support

This commit is contained in:
Alexander Foremny 2013-02-22 09:24:48 +01:00
parent 18180858af
commit fec1d4b2f7

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype
, libmcrypt, icu }: , icu }:
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
@ -111,11 +111,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
buildInputs = [gettext]; buildInputs = [gettext];
}; };
mcrypt = {
configureFlags = ["--with-mcrypt=${libmcrypt}"];
buildInputs = [libmcrypt];
};
intl = { intl = {
configureFlags = ["--enable-intl"]; configureFlags = ["--enable-intl"];
buildInputs = [icu]; buildInputs = [icu];
@ -156,7 +151,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
opensslSupport = config.php.openssl or true; opensslSupport = config.php.openssl or true;
mbstringSupport = config.php.mbstring or true; mbstringSupport = config.php.mbstring or true;
gdSupport = config.php.gd or true; gdSupport = config.php.gd or true;
mcryptSupport = config.php.mcrypt or true;
intlSupport = config.php.intl or true; intlSupport = config.php.intl or true;
exifSupport = config.php.exif or true; exifSupport = config.php.exif or true;
}; };