nixos/gnupg: choose the pinentry variant that has the selected flavor…

… definitely enabled
NixOS · Jan 14, 2024 · 1de7c1d · 1de7c1d
1 parent a880b50
commit 1de7c1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
@@ -102,8 +102,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 =

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
@@ -98,6 +98,7 @@ pinentryMkDerivation rec {
       Pinentry provides a console and (optional) GTK and Qt GUIs allowing users
       to enter a passphrase when `gpg' or `gpg2' is run and needs it.
     '';
+    mainProgram = "pinentry";
     maintainers = with maintainers; [ ttuegel fpletz ];
   };
 }