From 5d45d3aac1955bca607d29347cf8fb89af611d61 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Tue, 22 Oct 2024 18:01:37 +0200
Subject: [PATCH] configuration/gpg-ssh: Custom gnupg without builtin ccid
 driver in scdaemon

---
 configuration/gpg-ssh/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/configuration/gpg-ssh/default.nix b/configuration/gpg-ssh/default.nix
index fdabd61..497c280 100644
--- a/configuration/gpg-ssh/default.nix
+++ b/configuration/gpg-ssh/default.nix
@@ -1,7 +1,17 @@
 { pkgs, lib, ... }:
 
-{
+let
 
+  custom_gnupg = pkgs.gnupg.overrideAttrs (final: prev: {
+    configureFlags = prev.configureFlags ++ [
+      # Make sure scdaemon never ever again tries to use its own ccid driver
+      "--disable-ccid-driver"
+    ];
+  });
+
+in {
+
+  programs.gnupg.package = custom_gnupg;
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
@@ -9,7 +19,7 @@
   };
 
   environment.systemPackages = with pkgs; [
-    gnupg
+    custom_gnupg
     yubikey-personalization
     openpgp-card-tools