ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Adding ldap support to apache (true by default).

Browse Source 
I imagine noone would mind this 'addon' in their nixos apache installations.


svn path=/nixpkgs/trunk/; revision=26763
This commit is contained in:
Lluís Batlle i Rossell 2011-04-09 14:24:25 +00:00
parent c1c4d50d1a
commit 450ef3730c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/apr-util/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, apr, expat { stdenv, fetchurl, apr, expat
, bdbSupport ? false, db4 ? null , bdbSupport ? false, db4 ? null
, ldapSupport ? true, openldap
}: }:
assert bdbSupport -> db4 != null; assert bdbSupport -> db4 != null;
@ -15,10 +16,14 @@ stdenv.mkDerivation rec {
configureFlags = '' configureFlags = ''
--with-apr=${apr} --with-expat=${expat} --with-apr=${apr} --with-expat=${expat}
${if bdbSupport then "--with-berkeley-db=${db4}" else ""} ${if bdbSupport then "--with-berkeley-db=${db4}" else ""}
${if ldapSupport then "--with-ldap" else ""}
''; '';
buildInputs = if ldapSupport then [ openldap ] else [];
passthru = { passthru = {
inherit bdbSupport; inherit bdbSupport;
inherit ldapSupport;
}; };
meta = { meta = {

6
pkgs/servers/http/apache-httpd/default.nix
View File

@ -1,9 +1,11 @@
{ stdenv, fetchurl, openssl, perl, zlib { stdenv, fetchurl, openssl, perl, zlib
, sslSupport, proxySupport ? true , sslSupport, proxySupport ? true
, apr, aprutil, pcre , apr, aprutil, pcre
, ldapSupport ? true, openldap
}: }:
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.2.17"; version = "2.2.17";
@ -15,7 +17,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [perl apr aprutil pcre] ++ buildInputs = [perl apr aprutil pcre] ++
stdenv.lib.optional sslSupport openssl; stdenv.lib.optional sslSupport openssl ++
stdenv.lib.optional ldapSupport openldap;
# An apr-util header file includes an apr header file # An apr-util header file includes an apr header file
# through #include "" (quotes) # through #include "" (quotes)
@ -29,6 +32,7 @@ stdenv.mkDerivation rec {
--enable-authn-alias --enable-authn-alias
${if proxySupport then "--enable-proxy" else ""} ${if proxySupport then "--enable-proxy" else ""}
${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""} ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""}
${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""}
''; '';
postInstall = '' postInstall = ''