From a31d2a9465761db1923dbef8520e86deda7c1b66 Mon Sep 17 00:00:00 2001
From: Elias Kohout <elias@kohout.de>
Date: Tue, 7 Apr 2026 17:28:19 +0200
Subject: [PATCH] Fix CCID driver path: use ifd-ccid.bundle and correct pcsc
 directory location

---
 nixos/modules/yubikey.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/yubikey.nix b/nixos/modules/yubikey.nix
index 3220238..660ca7a 100644
--- a/nixos/modules/yubikey.nix
+++ b/nixos/modules/yubikey.nix
@@ -16,11 +16,9 @@
   # CCID driver for smartcard access (required for YubiKey CCID functionality)
   # Set up the PC/SC drivers directory with CCID driver bundle
   system.activationScripts.pcscdSetup = ''
-    mkdir -p /var/lib/pcsc/drivers/ccid.bundle
-    # Try to symlink CCID bundle files if they exist
-    if [ -d "${pkgs.ccid}/lib/pcsc/drivers/ccid.bundle" ]; then
-      ln -sf "${pkgs.ccid}/lib/pcsc/drivers/ccid.bundle"/* /var/lib/pcsc/drivers/ccid.bundle/ 2>/dev/null || true
-    fi
+    mkdir -p /var/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Linux
+    # Symlink CCID driver bundle
+    ln -sf "${pkgs.ccid}/pcsc/drivers/ifd-ccid.bundle"/* /var/lib/pcsc/drivers/ifd-ccid.bundle/ 2>/dev/null || true
   '';
 
   # YubiKey management tools