modules/gnupg: Default to using pinentry_gtk2

Prior to NixOS/nixpkgs@cb0adc11ffb0926adae7aa2ed22835c4f9ea971c, the
"pinentry" attribute defaulted to the GTK 2 flavour, but with the
mentioned commit, the default has changed to the ncurses one.

To make sure we have the same behaviour in our VM test as we had before
that change, I explicitly changed our default pinentry to pinentry_gtk2.

Signed-off-by: aszlig <aszlig@nix.build>

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/programs/gnupg/default.nix b/modules/programs/gnupg/default.nix
index db9bdc6b..5a0ba706 100644
--- a/modules/programs/gnupg/default.nix
+++ b/modules/programs/gnupg/default.nix
@@ -78,9 +78,9 @@ in {
 
       pinentry.program = mkOption {
         type = types.path;
-        default = "${pkgs.pinentry}/bin/pinentry";
-        defaultText = "\${pkgs.pinentry}/bin/pinentry";
-        example = literalExample "\${pkgs.pinentry_qt5}/bin/pinentry";
+        default = "${pkgs.pinentry_gtk2}/bin/pinentry";
+        defaultText = "\${pkgs.pinentry_gtk2}/bin/pinentry";
+        example = literalExample "\${pkgs.pinentry_qt}/bin/pinentry";
         description = "The pinentry program to use to ask for passphrases.";
       };