diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2019-07-02 16:16:04 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2019-07-02 16:16:56 +0900 |
| commit | 86e3208ca31bc3dcddc412c59eae2e42107abcec (patch) | |
| tree | c4d0229006592bd026c59403169ccbe3e4974ad1 | |
| parent | e8d00113e232230d7f53e23342b13acb230cfb56 (diff) | |
| download | nixlib-86e3208ca31bc3dcddc412c59eae2e42107abcec.tar nixlib-86e3208ca31bc3dcddc412c59eae2e42107abcec.tar.gz nixlib-86e3208ca31bc3dcddc412c59eae2e42107abcec.tar.bz2 nixlib-86e3208ca31bc3dcddc412c59eae2e42107abcec.tar.lz nixlib-86e3208ca31bc3dcddc412c59eae2e42107abcec.tar.xz nixlib-86e3208ca31bc3dcddc412c59eae2e42107abcec.tar.zst nixlib-86e3208ca31bc3dcddc412c59eae2e42107abcec.zip | |
yubico-piv-tool: support Apple PCSC, enable by default
| -rw-r--r-- | pkgs/tools/misc/yubico-piv-tool/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index b5c5aca0883b..eb978de06e65 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -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-1.7.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/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3e4654c12fd..433646d5c3bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13825,7 +13825,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 { }; |