krb5: add linux keyring support

This requires some minor hoop-hopping because it's involved in the
Linux bootstrap, but it's nothing too complicated.

Fixes #43289
wip/yesman
Dan Peebles 6 years ago
parent ac40184801
commit a5b5536e2a
  1. 3
      pkgs/development/libraries/kerberos/krb5.nix
  2. 3
      pkgs/top-level/all-packages.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds
, openssl, openldap, libedit
, openssl, openldap, libedit, keyutils
# Extra Arguments
, type ? ""
@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
# Provides the mig command used by the build scripts
++ optional stdenv.isDarwin bootstrap_cmds;
buildInputs = [ openssl ]
++ optionals (stdenv.hostPlatform.isLinux) [ keyutils ]
++ optionals (!libOnly) [ openldap libedit ];
preConfigure = "cd ./src";

@ -14196,7 +14196,8 @@ with pkgs;
kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod
};
keyutils = callPackage ../os-specific/linux/keyutils { };
# Using fetchurlBoot because this is used by kerberos (on Linux), which curl depends on
keyutils = callPackage ../os-specific/linux/keyutils { fetchurl = fetchurlBoot; };
libselinux = callPackage ../os-specific/linux/libselinux { };

Loading…
Cancel
Save