python3Packages.k5test: disambiguate krb5

PyPI also has a package called krb5 and this package wants the
system krb5, not the PyPI one.
This commit is contained in:
Elliot Cameron 2024-08-07 14:04:39 -04:00
parent 4c2d4a4fbb
commit 392892b6bb
3 changed files with 11 additions and 9 deletions

View File

@ -1,12 +1,12 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchPypi,
substituteAll,
findutils,
krb5,
krb5-c,
pythonOlder,
setuptools,
substituteAll,
}:
buildPythonPackage rec {
@ -24,9 +24,10 @@ buildPythonPackage rec {
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit findutils krb5;
inherit findutils;
krb5 = krb5-c;
# krb5-config is in dev output
krb5Dev = krb5.dev;
krb5Dev = krb5-c.dev;
})
];

View File

@ -2,7 +2,7 @@
lib,
fetchPypi,
buildPythonPackage,
pkgs,
krb5-c, # C krb5 library, not PyPI krb5
}:
buildPythonPackage rec {
@ -15,9 +15,9 @@ buildPythonPackage rec {
hash = "sha256-nXAevY/FlsmdMVXVukWBO9WQjSbvg7oK3SUO22IqvtQ=";
};
nativeBuildInputs = [ pkgs.krb5 ]; # for krb5-config
nativeBuildInputs = [ krb5-c ]; # for krb5-config
buildInputs = [ pkgs.krb5 ];
buildInputs = [ krb5-c ];
# there are no tests
doCheck = false;

View File

@ -6536,7 +6536,8 @@ self: super: with self; {
k-diffusion = callPackage ../development/python-modules/k-diffusion { };
k5test = callPackage ../development/python-modules/k5test {
inherit (pkgs) krb5 findutils;
inherit (pkgs) findutils;
krb5-c = pkgs.krb5;
};
kaa-base = callPackage ../development/python-modules/kaa-base { };