JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

php: Add mcrypt optional support

Browse Source 
Use an override with mcrypt = true to enable libmcrypt support in php.
The --disable-posix-threadsds mcrypt build option was required by php.
This commit is contained in:
bbenoist 2013-02-12 19:33:39 +01:00 committed by Baptist BENOIST
parent b42ba898e1
commit 8fd5fcbda5
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/interpreters/php/5.3.nix
View File

@ -1,7 +1,11 @@
{ 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
, libxslt }: , libxslt, libmcrypt }:
let
libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
in
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
@ -116,6 +120,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
buildInputs = [libxslt]; buildInputs = [libxslt];
}; };
mcrypt = {
configureFlags = ["--with-mcrypt=${libmcrypt}"];
buildInputs = [libmcryptOverride];
};
/* /*
php is build within this derivation in order to add the xdebug lines to the php.ini. php is build within this derivation in order to add the xdebug lines to the php.ini.
So both Apache and command line php both use xdebug without having to configure anything. So both Apache and command line php both use xdebug without having to configure anything.
@ -148,6 +157,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
mbstringSupport = config.php.mbstring or true; mbstringSupport = config.php.mbstring or true;
gdSupport = config.php.gd or true; gdSupport = config.php.gd or true;
xslSupport = config.php.xsl or false; xslSupport = config.php.xsl or false;
mcryptSupport = config.php.mcrypt or false;
}; };
configurePhase = '' configurePhase = ''

9
pkgs/development/libraries/libmcrypt/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, disablePosixThreads ? false }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libmcrypt-2.5.8"; name = "libmcrypt-2.5.8";
@ -10,7 +12,12 @@ stdenv.mkDerivation rec {
buildInputs = []; buildInputs = [];
configureFlags = optional disablePosixThreads
[ "--disable-posix-threads" ];
meta = { meta = {
description = "MCrypt is a replacement for the old crypt() package and crypt(1) command, with extensions.";
homepage = http://mcrypt.sourceforge.net; homepage = http://mcrypt.sourceforge.net;
license = "GPL";
}; };
} }