Merge pull request #161198 from viraptor/viraptor/bump-yubico-piv-tool

yubico-piv-tool: 2.0.0 -> 2.2.1
This commit is contained in:
Mario Rodas 2022-05-02 08:49:57 -05:00 committed by GitHub
commit 9ff547036a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,20 +1,28 @@
{ lib, stdenv, fetchurl, pkg-config, openssl, check, pcsclite, PCSC { lib, stdenv, fetchurl, pkg-config, openssl, check, pcsclite, PCSC, gengetopt, cmake
, withApplePCSC ? stdenv.isDarwin , withApplePCSC ? stdenv.isDarwin
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yubico-piv-tool"; pname = "yubico-piv-tool";
version = "2.0.0"; version = "2.2.1";
src = fetchurl { src = fetchurl {
url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz"; url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz";
sha256 = "124lhlim05gw32ydjh1yawqbnx6wdllz1ir9j00j09wji3m11rfs"; sha256 = "sha256-t+3k3cPW4x3mey4t3NMZsitAzC4Jc7mGbQUqdUSTsU4=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config cmake gengetopt ];
buildInputs = [ openssl check ] buildInputs = [ openssl check ]
++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);
cmakeFlags = [
"-DGENERATE_MAN_PAGES=OFF" # Use the man page generated at release time
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_MANDIR=share/man"
"-DCMAKE_INSTALL_LIBDIR=lib"
];
configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ];
meta = with lib; { meta = with lib; {
@ -32,5 +40,6 @@ stdenv.mkDerivation rec {
''; '';
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ viraptor ];
}; };
} }