From 458544594ba7f0333cf5718045ee7a8eaf5de433 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 24 Dec 2023 03:27:45 +0100 Subject: [PATCH] gpg-agent: don't set a default for pinentry NixOS stopped building gtk2 pinentry by default in https://github.com/NixOS/nixpkgs/pull/270266 and there does not appear to be a reasonable other default. --- modules/services/gpg-agent.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix index 9139c8a81..70e4df0a5 100644 --- a/modules/services/gpg-agent.nix +++ b/modules/services/gpg-agent.nix @@ -198,7 +198,7 @@ in { pinentryFlavor = mkOption { type = types.nullOr (types.enum pkgs.pinentry.flavors); example = "gnome3"; - default = "gtk2"; + default = null; description = '' Which pinentry interface to use. If not `null`, it sets @@ -210,8 +210,6 @@ in { ```nix services.dbus.packages = [ pkgs.gcr ]; ``` - For this reason, the default is `gtk2` for - now. ''; };