b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #64114 from thefloweringash/yubico-piv-tool-mac

Browse source 
yubico-piv-tool: support Apple PCSC, enable by default
This commit is contained in:
Mario Rodas 2020-03-13 08:34:05 -05:00 committed by GitHub
parent cc1f45ba65 86e3208ca3
commit 43d1c44e49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/misc/yubico-piv-tool/default.nix
View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }:
{ stdenv, fetchurl, pkgconfig, openssl, check, pcsclite, PCSC
, withApplePCSC ? stdenv.isDarwin
}:
stdenv.mkDerivation rec {
name = "yubico-piv-tool-2.0.0";
@ -9,9 +11,10 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl pcsclite check ];
buildInputs = [ openssl check ]
++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);
configureFlags = [ "--with-backend=pcsc" ];
configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ];
meta = with stdenv.lib; {
homepage = https://developers.yubico.com/yubico-piv-tool/;

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

@ -14902,7 +14902,9 @@ in
yubico-pam = callPackage ../development/libraries/yubico-pam { };
yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { };
yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool {
inherit (darwin.apple_sdk.frameworks) PCSC;
};
yubikey-manager = callPackage ../tools/misc/yubikey-manager { };