Migrate all heimdal -> libheimdal

Also disable heimdal references in samba as it uses internal api
features not guaranteed to be stable
This commit is contained in:
William A. Kennington III 2015-06-26 17:22:58 -07:00
parent fa1bdb8cbd
commit adeab5e815
3 changed files with 5 additions and 5 deletions

View File

@ -30,7 +30,7 @@
, nspr
, nss
, pango
, heimdal
, libheimdal
, libpulseaudio
, systemd
}:
@ -102,7 +102,7 @@ stdenv.mkDerivation {
nspr
nss
pango
heimdal
libheimdal
libpulseaudio
systemd
] + ":" + stdenv.lib.makeSearchPath "lib64" [

View File

@ -30,7 +30,7 @@
, nspr
, nss
, pango
, heimdal
, libheimdal
, libpulseaudio
, systemd
}:
@ -102,7 +102,7 @@ stdenv.mkDerivation {
nspr
nss
pango
heimdal
libheimdal
libpulseaudio
systemd
] + ":" + stdenv.lib.makeSearchPath "lib64" [

View File

@ -9097,7 +9097,7 @@ let
samba4 = callPackage ../servers/samba/4.x.nix {
python = python2;
kerberos = heimdal;
kerberos = null; # Bundle kerberos because samba uses internal, non-stable functions
gnutls = gnutls33;
# enableLDAP
};