Merge pull request #45360 from copumpkin/krb5-keyring

krb5: add linux keyring support
This commit is contained in:
Daniel Peebles 2018-08-21 07:43:48 -04:00 committed by GitHub
commit 794cfa7d3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -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";

View File

@ -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 { };