diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 412e4be2295a..97b79530fa68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6336,9 +6336,9 @@ let
 
   hamlib = callPackage ../development/libraries/hamlib { };
 
-  # TODO : Add Heimdal Kerberos and let admin choose.
-  # Modularize heimdal into a library first
-  kerberos = libkrb5;
+  # TODO : Add MIT Kerberos and let admin choose.
+  # TODO : Fix kerberos on Darwin
+  kerberos = if stdenv.isDarwin then null else heimdal;
 
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
     openldap = openldap.override {
@@ -6472,6 +6472,9 @@ let
   kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
+    openldap = openldap.override {
+      cyrus_sasl = cyrus_sasl.override { kerberos = null; };
+    };
     inherit (darwin) bootstrap_cmds;
   };
   libkrb5 = krb5.override {