summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Callahan <dan.callahan@gmail.com>2022-11-15 12:35:20 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-01-03 16:41:31 +0000
commit48f15d788865562dc55b89823f7bc06a592fabcf (patch)
tree2d53b1d2121e10483adbcf017c436adad7fa43e9
parentMerge pull request #206558 from timothyklim/pg15-zstd-backport (diff)
downloadnixpkgs-origin/backport-201314-to-release-22.11.tar.gz
gnupg: fix smartcards (yubikeys) on Darwinorigin/backport-201314-to-release-22.11
Since version 2.3, GnuPG no longer falls back to other access methods if its built-in CCID driver fails to access smartcards, including yubikeys. The built-in CCID driver fails on macOS. The upstream developers recommend disabling CCID support in this case: If it works and the distribution doesn't offer appropriate USB configuration, I think that it's good for the distribution to use --disable-ccid-driver for building GnuPG. Cite: https://dev.gnupg.org/T5415 See also: https://dev.gnupg.org/T5409 Fixes #155629 (cherry picked from commit 973c7b12caebf5dd8dee48f15b14e5525551f95d)
-rw-r--r--pkgs/tools/security/gnupg/23.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix
index 0b7941ce46e1..2030e8195e68 100644
--- a/pkgs/tools/security/gnupg/23.nix
+++ b/pkgs/tools/security/gnupg/23.nix
@@ -57,7 +57,8 @@ stdenv.mkDerivation rec {
"--with-ksba-prefix=${libksba.dev}"
"--with-npth-prefix=${npth}"
] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"
- ++ lib.optional withTpm2Tss "--with-tss=intel";
+ ++ lib.optional withTpm2Tss "--with-tss=intel"
+ ++ lib.optional stdenv.isDarwin "--disable-ccid-driver";
postInstall = if enableMinimal
then ''
rm -r $out/{libexec,sbin,share}