From f8bb0d071c17a4c91b95953e3d9a0a3f0b06d339 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Mon, 13 May 2024 22:38:33 +0200
Subject: [PATCH] chore: use global pcsclite workaround

---
 pkgs/default.nix     | 14 ++++++++++++++
 users/myuser/gpg.nix | 16 ----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 42c07d9..d8f9419 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -25,6 +25,20 @@
     kanidm-provision = prev.callPackage ./kanidm-provision.nix {};
     segoe-ui-ttf = prev.callPackage ./segoe-ui-ttf.nix {};
     zsh-histdb-skim = prev.callPackage ./zsh-skim-histdb.nix {};
+    pcsclite_fixed = prev.pcsclite.overrideAttrs (old: {
+      postPatch =
+        old.postPatch
+        + (prev.lib.optionalString (!(prev.lib.strings.hasInfix ''--replace-fail "libpcsclite_real.so.1"'' old.postPatch)) ''
+          substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
+            --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
+        '');
+    });
+    gnupg = prev.gnupg.override {
+      pcsclite = _final.pcsclite_fixed;
+    };
+    age-plugin-yubikey = prev.age-plugin-yubikey.override {
+      pcsclite = _final.pcsclite_fixed;
+    };
     neovim-clean = prev.neovim-unwrapped.overrideAttrs (old: {
       nativeBuildInputs = (old.nativeBuildInputs or []) ++ [prev.makeWrapper];
       postInstall =
diff --git a/users/myuser/gpg.nix b/users/myuser/gpg.nix
index 7c1c7b4..4a24ac4 100644
--- a/users/myuser/gpg.nix
+++ b/users/myuser/gpg.nix
@@ -1,25 +1,9 @@
 {
-  lib,
   nixosConfig,
   pkgs,
   ...
 }: {
   programs.gpg = {
-    /*
-    low impact workaround to integrate the fix not yet merged to nixos-unstable, see:
-    - https://discourse.nixos.org/t/gpg-selecting-card-failed-service-is-not-running/44974/12
-    - https://github.com/NixOS/nixpkgs/pull/308884
-    */
-    package = pkgs.gnupg.override {
-      pcsclite = pkgs.pcsclite.overrideAttrs (old: {
-        postPatch =
-          old.postPatch
-          + (lib.optionalString (!(lib.strings.hasInfix ''--replace-fail "libpcsclite_real.so.1"'' old.postPatch)) ''
-            substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
-              --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
-          '');
-      });
-    };
     enable = true;
     scdaemonSettings.disable-ccid = true;
     publicKeys = [