From bfe1c69ede273ec56c848e424527ca8d1ffa3193 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Mon, 13 Jan 2020 19:10:32 +0000
Subject: [PATCH] nixos/gnupg: actually use the configured gpg package

Previously, this would ignore the `package` option if `pinentryFlavor`
was set.
---
 nixos/modules/programs/gnupg.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index 2d262d906579..7a3cb588ee71 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -96,7 +96,7 @@ in
     # This overrides the systemd user unit shipped with the gnupg package
     systemd.user.services.gpg-agent = mkIf (cfg.agent.pinentryFlavor != null) {
       serviceConfig.ExecStart = [ "" ''
-        ${pkgs.gnupg}/bin/gpg-agent --supervised \
+        ${cfg.package}/bin/gpg-agent --supervised \
           --pinentry-program ${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry
       '' ];
     };