From 79d9127ea6c56b07b9ccf4303ebadbd294c04b74 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Thu, 8 Aug 2024 15:02:30 -0400 Subject: [PATCH] python3Packages.gssapi: disambiguate krb5 PyPI also has a package called krb5 and this package wants the system krb5, not the PyPI one. --- pkgs/development/python-modules/gssapi/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 44a7b87ec7c3..08683996db8d 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -7,7 +7,6 @@ # build-system cython, - krb5, setuptools, # dependencies @@ -15,6 +14,7 @@ # native dependencies GSS, + krb5-c, # C krb5 library, not PyPI krb5 # tests parameterized, @@ -38,7 +38,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5}"' + --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5-c}"' ''; env = lib.optionalAttrs (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) { @@ -47,7 +47,7 @@ buildPythonPackage rec { build-system = [ cython - krb5 + krb5-c setuptools ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 69ea001aeac3..b63d0c230734 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5370,8 +5370,8 @@ self: super: with self; { gspread = callPackage ../development/python-modules/gspread { }; gssapi = callPackage ../development/python-modules/gssapi { - inherit (pkgs) krb5; inherit (pkgs.darwin.apple_sdk.frameworks) GSS; + krb5-c = pkgs.krb5; }; gst-python = callPackage ../development/python-modules/gst-python {