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:
parent
fa1bdb8cbd
commit
adeab5e815
@ -30,7 +30,7 @@
|
|||||||
, nspr
|
, nspr
|
||||||
, nss
|
, nss
|
||||||
, pango
|
, pango
|
||||||
, heimdal
|
, libheimdal
|
||||||
, libpulseaudio
|
, libpulseaudio
|
||||||
, systemd
|
, systemd
|
||||||
}:
|
}:
|
||||||
@ -102,7 +102,7 @@ stdenv.mkDerivation {
|
|||||||
nspr
|
nspr
|
||||||
nss
|
nss
|
||||||
pango
|
pango
|
||||||
heimdal
|
libheimdal
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
systemd
|
systemd
|
||||||
] + ":" + stdenv.lib.makeSearchPath "lib64" [
|
] + ":" + stdenv.lib.makeSearchPath "lib64" [
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
, nspr
|
, nspr
|
||||||
, nss
|
, nss
|
||||||
, pango
|
, pango
|
||||||
, heimdal
|
, libheimdal
|
||||||
, libpulseaudio
|
, libpulseaudio
|
||||||
, systemd
|
, systemd
|
||||||
}:
|
}:
|
||||||
@ -102,7 +102,7 @@ stdenv.mkDerivation {
|
|||||||
nspr
|
nspr
|
||||||
nss
|
nss
|
||||||
pango
|
pango
|
||||||
heimdal
|
libheimdal
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
systemd
|
systemd
|
||||||
] + ":" + stdenv.lib.makeSearchPath "lib64" [
|
] + ":" + stdenv.lib.makeSearchPath "lib64" [
|
||||||
|
@ -9097,7 +9097,7 @@ let
|
|||||||
|
|
||||||
samba4 = callPackage ../servers/samba/4.x.nix {
|
samba4 = callPackage ../servers/samba/4.x.nix {
|
||||||
python = python2;
|
python = python2;
|
||||||
kerberos = heimdal;
|
kerberos = null; # Bundle kerberos because samba uses internal, non-stable functions
|
||||||
gnutls = gnutls33;
|
gnutls = gnutls33;
|
||||||
# enableLDAP
|
# enableLDAP
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user