Merge staging-next into staging

2020-12-26 18:28:57 +00:00
parent 8cedad3fe6 389bd2bd4c
commit d4a33d75f2
20 changed files with 236 additions and 811 deletions
@@ -1,4 +1,5 @@
 { stdenv
+, pkgs
 , fetchurl
 , fetchpatch
 , zlib
@@ -68,7 +69,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkgconfig ]
    ++ optional (hpnSupport || withGssapiPatches) autoreconfHook
-    ++ optional withKerberos kerberos.dev;
+    ++ optional withKerberos pkgs.kerberos.dev;
  buildInputs = [ zlib openssl libedit pam ]
    ++ optional withFIDO libfido2
    ++ optional withKerberos kerberos;