From 1a80033a14475c3c86215caa794a5a5dfff52c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 29 Dec 2023 04:29:06 +0100
Subject: [PATCH] nixos/gnupg: choose the pinentry variant that has the
 selected flavor definitely enabled

---
 nixos/modules/programs/gnupg.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index f6341f1b5ebadcf..4d0f43015277626 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -101,8 +101,7 @@ in
 
   config = mkIf cfg.agent.enable {
     programs.gnupg.agent.settings = {
-      pinentry-program = lib.mkIf (cfg.agent.pinentryFlavor != null)
-        "${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry";
+      pinentry-program = lib.mkIf (cfg.agent.pinentryFlavor != null) lib.getExe pkgs."pinentry-${cfg.agent.pinentryFlavor}";
     };
 
     environment.etc."gnupg/gpg-agent.conf".source =