b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

cyrus_sasl: Enable kerberos

Browse source
This commit is contained in:
William A. Kennington III 2014-12-30 01:04:16 -08:00 committed by Peter Simons
parent 41a4f1fa3b
commit fbac211a2c
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/cyrus-sasl/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, openssl, db, gettext, pam, fixDarwinDylibNames }:
{ lib, stdenv, fetchurl, openssl, kerberos, db, gettext, pam, fixDarwinDylibNames }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "cyrus-sasl-2.1.26";
name = "cyrus-sasl-2.1.26${optionalString (kerberos == null) "-without-kerberos"}";
src = fetchurl {
url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz";
@ -9,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ openssl db gettext ]
[ openssl db gettext kerberos ]
++ lib.optional stdenv.isLinux pam
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://cyrusimap.web.cmu.edu/";
description = "library for adding authentication support to connection-based protocols";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = platforms.unix;
maintainers = with maintainers; [ simons ];
};
}

13
pkgs/top-level/all-packages.nix
View file

@ -5532,7 +5532,12 @@ let
# TODO : Add MIT Kerberos and let admin choose.
kerberos = heimdal;
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
openldap = openldap.override {
cyrus_sasl = cyrus_sasl.override { kerberos = null; };
};
cyrus_sasl = cyrus_sasl.override { kerberos = null; };
};
harfbuzz = callPackage ../development/libraries/harfbuzz { };
harfbuzz-icu = callPackage ../development/libraries/harfbuzz {
@ -5640,7 +5645,11 @@ let
automake = automake111x;
};
krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
openldap = openldap.override {
cyrus_sasl = cyrus_sasl.override { kerberos = null; };
};
};
LASzip = callPackage ../development/libraries/LASzip { };