Use mit5 as kerberos since it is better supported

This commit is contained in:
William A. Kennington III 2015-05-28 17:47:04 -07:00
parent 7141d96bde
commit 80648d7e24

View File

@ -6328,9 +6328,9 @@ let
hamlib = callPackage ../development/libraries/hamlib { }; hamlib = callPackage ../development/libraries/hamlib { };
# TODO : Add MIT Kerberos and let admin choose. # TODO : Add Heimdal Kerberos and let admin choose.
# TODO : Fix kerberos on Darwin # Modularize heimdal into a library first
kerberos = if stdenv.isDarwin then null else heimdal; kerberos = libkrb5;
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
openldap = openldap.override { openldap = openldap.override {
@ -6464,9 +6464,6 @@ let
kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
krb5 = callPackage ../development/libraries/kerberos/krb5.nix { krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
openldap = openldap.override {
cyrus_sasl = cyrus_sasl.override { kerberos = null; };
};
inherit (darwin) bootstrap_cmds; inherit (darwin) bootstrap_cmds;
}; };
libkrb5 = krb5.override { libkrb5 = krb5.override {