diff options
author | William A. Kennington III <william@wkennington.com> | 2014-12-30 01:04:16 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2014-12-30 01:04:16 -0800 |
commit | 488e6e6e9c214efcd902d733b70380365c4752c6 (patch) | |
tree | 8129e002083c30fcc9c9483b162407942459f2f8 | |
parent | 0196fda4f4d27e9b3c99a9987f5e7a9febb3bcab (diff) | |
download | nixlib-488e6e6e9c214efcd902d733b70380365c4752c6.tar nixlib-488e6e6e9c214efcd902d733b70380365c4752c6.tar.gz nixlib-488e6e6e9c214efcd902d733b70380365c4752c6.tar.bz2 nixlib-488e6e6e9c214efcd902d733b70380365c4752c6.tar.lz nixlib-488e6e6e9c214efcd902d733b70380365c4752c6.tar.xz nixlib-488e6e6e9c214efcd902d733b70380365c4752c6.tar.zst nixlib-488e6e6e9c214efcd902d733b70380365c4752c6.zip |
cyrus_sasl: Enable kerberos
-rw-r--r-- | pkgs/development/libraries/cyrus-sasl/default.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
2 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 391638548fb7..5470797b42f9 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d060ee1d3788..2cb3ea834d92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5529,7 +5529,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 { @@ -5637,7 +5642,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 { }; |