diff options
| author | edef <edef@edef.eu> | 2020-01-13 19:10:32 +0000 |
|---|---|---|
| committer | edef <edef@edef.eu> | 2020-01-24 15:54:57 +0000 |
| commit | bfe1c69ede273ec56c848e424527ca8d1ffa3193 (patch) | |
| tree | 8e1956fc1a0558b796fe6ae800d93e01f9138a38 /nixos/modules/programs | |
| parent | 402b97fa1ecae97cbbce7211de3e754b347a4a60 (diff) | |
| download | nixlib-bfe1c69ede273ec56c848e424527ca8d1ffa3193.tar nixlib-bfe1c69ede273ec56c848e424527ca8d1ffa3193.tar.gz nixlib-bfe1c69ede273ec56c848e424527ca8d1ffa3193.tar.bz2 nixlib-bfe1c69ede273ec56c848e424527ca8d1ffa3193.tar.lz nixlib-bfe1c69ede273ec56c848e424527ca8d1ffa3193.tar.xz nixlib-bfe1c69ede273ec56c848e424527ca8d1ffa3193.tar.zst nixlib-bfe1c69ede273ec56c848e424527ca8d1ffa3193.zip | |
nixos/gnupg: actually use the configured gpg package
Previously, this would ignore the `package` option if `pinentryFlavor` was set.
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/gnupg.nix | 2 |
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 '' ]; }; |