From 1de7c1d89ca21572c19fdbfb07484b4dc1064543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= 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 +-- pkgs/tools/security/pinentry/default.nix | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index c4f497c86ec57e..59c49fa79b6c4d 100644 --- 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 index 11d245374f9a7a..af363ea21ff998 100644 --- 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 ]; }; }