From abd423621a33279f5d17abc6854f0a7579b4b5c1 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 10 Jul 2013 08:48:36 +0200 Subject: [PATCH] php 5.4: Add LDAP support --- pkgs/development/interpreters/php/5.4.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 35b1f82c246..4aa0c9df75e 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype -, libxslt, libmcrypt, bzip2, icu }: +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl }: let libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; @@ -30,6 +30,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) # Extensions + ldap = { + configureFlags = ["--with-ldap=${openldap}"]; + buildInputs = [openldap cyrus_sasl openssl]; + }; + curl = { configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; buildInputs = [curl openssl]; @@ -167,6 +172,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; cfg = { + ldapSupport = config.php.ldap or true; mysqlSupport = config.php.mysql or true; mysqliSupport = config.php.mysqli or true; pdo_mysqlSupport = config.php.pdo_mysql or true; @@ -214,7 +220,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) ''; src = fetchurl { - url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; + urls = [ + "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror" + "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror" + ]; sha256 = "0dh159svdrakvm9nsyg3yyln7cqqzpxgs2163cqxplnc93d8a8id"; name = "php-${version}.tar.bz2"; };