Merge pull request #296883 from veehaitch/fix-yubico-pam-darwin

yubico-pam: fix Darwin build
This commit is contained in:
Emily Trau 2024-03-19 19:43:55 +11:00 committed by GitHub
commit 84102223f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions

View file

@ -10,6 +10,8 @@
, yubikey-personalization , yubikey-personalization
, libyubikey , libyubikey
, libykclient , libykclient
, CoreServices
, SystemConfiguration
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -23,7 +25,8 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ]; nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ];
buildInputs = [ pam yubikey-personalization libyubikey libykclient ]; buildInputs = [ pam yubikey-personalization libyubikey libykclient ]
++ lib.optionals stdenv.isDarwin [ CoreServices SystemConfiguration ];
meta = with lib; { meta = with lib; {
description = "Yubico PAM module"; description = "Yubico PAM module";

View file

@ -25374,7 +25374,9 @@ with pkgs;
yojimbo = callPackage ../development/libraries/yojimbo { }; yojimbo = callPackage ../development/libraries/yojimbo { };
yubico-pam = callPackage ../development/libraries/yubico-pam { }; yubico-pam = callPackage ../development/libraries/yubico-pam {
inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
};
yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool {
inherit (darwin.apple_sdk.frameworks) PCSC; inherit (darwin.apple_sdk.frameworks) PCSC;