summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-12-30 01:04:16 -0800
committerPeter Simons <simons@cryp.to>2015-01-01 15:45:32 +0100
commitfbac211a2c2606c3ba0ecd26e87b5925cc6db3ae (patch)
tree3bdbc8cc860619eb8d88f1d8405f4002edb8aac3 /pkgs/top-level
parent41a4f1fa3b96524be5095390a1119df43e2699b4 (diff)
downloadnixlib-fbac211a2c2606c3ba0ecd26e87b5925cc6db3ae.tar
nixlib-fbac211a2c2606c3ba0ecd26e87b5925cc6db3ae.tar.gz
nixlib-fbac211a2c2606c3ba0ecd26e87b5925cc6db3ae.tar.bz2
nixlib-fbac211a2c2606c3ba0ecd26e87b5925cc6db3ae.tar.lz
nixlib-fbac211a2c2606c3ba0ecd26e87b5925cc6db3ae.tar.xz
nixlib-fbac211a2c2606c3ba0ecd26e87b5925cc6db3ae.tar.zst
nixlib-fbac211a2c2606c3ba0ecd26e87b5925cc6db3ae.zip
cyrus_sasl: Enable kerberos
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cb69f50be99..dc5d21eddd25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };