gnupg: disable gtk-2

diff --git a/flake.lock b/flake.lock
index ca87e43dd81323c1f1f9ea98507d9ea74bf1266e..cd7ecdfb3e7f895020fd6c1a6765513b545b10a7 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -67,7 +67,7 @@
     "shell": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-Ixq0MWK4OaM2Gg1JlSW9oB1zkscFzqlOmHh8ESG1bjo=",
+        "narHash": "sha256-8qSmLQPjoNH/Em36TKyDzMa0YQ6geSfgmQE3SCeXT+Y=",
         "path": "./shell",
         "type": "path"
       },

diff --git a/nixpkgs/overlays/gnupg.nix b/nixpkgs/overlays/gnupg.nix
new file mode 100644 (file)
index 0000000..5abdf6c
--- /dev/null
+++ b/nixpkgs/overlays/gnupg.nix
@@ -0,0 +1,8 @@
+self: super: {
+  # Avoid rebuilding graphical dependencies
+  # when using Nixpkgs PRs rebuilding them.
+  # See https://github.com/NixOS/nixpkgs/issues/96306#issuecomment-722140002
+  pinentry = super.pinentry.override {
+    enabledFlavors = [ "curses" "tty" ];
+  };
+}

diff --git a/shell/modules/tools/security/gnupg.nix b/shell/modules/tools/security/gnupg.nix
index 7f8816728e5377f7ece38f1183b0cddd3bd299db..ac57ff0df4ff991cd091d7b5df0063c6f3e3aa7a 100644 (file)
--- a/shell/modules/tools/security/gnupg.nix
+++ b/shell/modules/tools/security/gnupg.nix
@@ -419,7 +419,7 @@ options.gnupg = {
         curses) exec ${pkgs.pinentry.curses}/bin/pinentry-curses "$@";;
         #emacs)  exec ''${pkgs.pinentry.emacs}/bin/pinentry-emacs "$@";;
         #gnome3) exec ''${pkgs.pinentry.gnome3}/bin/pinentry-gnome3 "$@";;
-        gtk-2)  exec ${pkgs.pinentry.gtk2}/bin/pinentry-gtk-2 "$@";;
+        gtk-2)  exec ''${pkgs.pinentry.gtk2}/bin/pinentry-gtk-2 "$@";;
         none)   exit 1;; # do not ask for passphrase
         #qt)     exec ''${pkgs.pinentry.qt}/bin/pinentry-qt "$@";;
         tty)    exec ${pkgs.pinentry.tty}/bin/pinentry-tty "$@";;