tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

(cherry picked from commit a5b5536e2a720aeb559f10ff8f50b1ca7f36725a)

Dan Peebles e5784423 f45cefe9

+4 -2
+2 -1
pkgs/development/libraries/kerberos/krb5.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds 2 - , openssl, openldap, libedit 2 + , openssl, openldap, libedit, keyutils 3 3 4 4 # Extra Arguments 5 5 , type ? "" ··· 34 34 # Provides the mig command used by the build scripts 35 35 ++ optional stdenv.isDarwin bootstrap_cmds; 36 36 buildInputs = [ openssl ] 37 + ++ optionals (stdenv.hostPlatform.isLinux) [ keyutils ] 37 38 ++ optionals (!libOnly) [ openldap libedit ]; 38 39 39 40 preConfigure = "cd ./src";
+2 -1
pkgs/top-level/all-packages.nix
··· 13604 13604 ''; 13605 13605 }; 13606 13606 13607 - keyutils = callPackage ../os-specific/linux/keyutils { }; 13607 + # Using fetchurlBoot because this is used by kerberos (on Linux), which curl depends on 13608 + keyutils = callPackage ../os-specific/linux/keyutils { fetchurl = fetchurlBoot; }; 13608 13609 13609 13610 libselinux = callPackage ../os-specific/linux/libselinux { }; 13610 13611