about summary refs log tree commit diff
path: root/pkgs/tools/misc/yubico-piv-tool
diff options
context:
space:
mode:
authorStanisław Pitucha <stan.pitucha@envato.com>2022-02-21 20:12:06 +1100
committerStanisław Pitucha <viraptor@gmail.com>2022-05-02 23:08:11 +1000
commita71f6bdc7ccfa19b43ab6f530e5be5a67cba7ba1 (patch)
treea3cd9c57663518e0eee961e458d9e7ec8301b4d6 /pkgs/tools/misc/yubico-piv-tool
parenta585b1c70900a1ecf0a782eb0f6f09d405e5e6e3 (diff)
yubico-piv-tool: 2.0.0 -> 2.2.1
Bump the version. This covers security advisory YSA-2020-02.
The update required including cmake for the new build system.
Diffstat (limited to 'pkgs/tools/misc/yubico-piv-tool')
-rw-r--r--pkgs/tools/misc/yubico-piv-tool/default.nix16
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix
index 6d80cd2400d2c..0a27cff9c2763 100644
--- a/pkgs/tools/misc/yubico-piv-tool/default.nix
+++ b/pkgs/tools/misc/yubico-piv-tool/default.nix
@@ -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
 }:
 
 stdenv.mkDerivation rec {
   pname = "yubico-piv-tool";
-  version = "2.0.0";
+  version = "2.2.1";
 
   src = fetchurl {
     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 ]
     ++ (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"}" ];
 
   meta = with lib; {