about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-01-24 11:10:20 -0500
committerGitHub <noreply@github.com>2020-01-24 11:10:20 -0500
commit7e9b1564e661026f42c09fb6cfa521dd4294c445 (patch)
tree8e1956fc1a0558b796fe6ae800d93e01f9138a38
parent402b97fa1ecae97cbbce7211de3e754b347a4a60 (diff)
parentbfe1c69ede273ec56c848e424527ca8d1ffa3193 (diff)
downloadnixlib-7e9b1564e661026f42c09fb6cfa521dd4294c445.tar
nixlib-7e9b1564e661026f42c09fb6cfa521dd4294c445.tar.gz
nixlib-7e9b1564e661026f42c09fb6cfa521dd4294c445.tar.bz2
nixlib-7e9b1564e661026f42c09fb6cfa521dd4294c445.tar.lz
nixlib-7e9b1564e661026f42c09fb6cfa521dd4294c445.tar.xz
nixlib-7e9b1564e661026f42c09fb6cfa521dd4294c445.tar.zst
nixlib-7e9b1564e661026f42c09fb6cfa521dd4294c445.zip
Merge pull request #78423 from edef1c/gnupg-package
nixos/gnupg: actually use the configured gpg package
-rw-r--r--nixos/modules/programs/gnupg.nix2
1 files changed, 1 insertions, 1 deletions
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
       '' ];
     };