From 80648d7e242bcb9e9ed544a2561c433ee22fb5aa Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 28 May 2015 17:47:04 -0700
Subject: [PATCH] Use mit5 as kerberos since it is better supported

---
 pkgs/top-level/all-packages.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c93d103f59..b307a54c85c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6328,9 +6328,9 @@ let
 
   hamlib = callPackage ../development/libraries/hamlib { };
 
-  # TODO : Add MIT Kerberos and let admin choose.
-  # TODO : Fix kerberos on Darwin
-  kerberos = if stdenv.isDarwin then null else heimdal;
+  # TODO : Add Heimdal Kerberos and let admin choose.
+  # Modularize heimdal into a library first
+  kerberos = libkrb5;
 
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
     openldap = openldap.override {
@@ -6464,9 +6464,6 @@ 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 {