swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

krb5: add linux keyring support

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

Fixes #43289
This commit is contained in:
Dan Peebles 2018-08-20 02:17:46 +00:00
parent ac40184801
commit a5b5536e2a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/kerberos/krb5.nix
View file

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

3
pkgs/top-level/all-packages.nix
View file

@ -14196,7 +14196,8 @@ with pkgs;
kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod 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 { }; libselinux = callPackage ../os-specific/linux/libselinux { };