Revert "pinentry: make GTK3 the default front-end"

This reverts commit 3f7e3db74426f658b4625505d262c1f7b288606d.

This broke the gpg-agent user service. See #27468.

Changed files
+4 -6
nixos
modules
config
pkgs
top-level
+1 -1
nixos/modules/config/no-x-libs.nix
···
networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };
-
pinentry = pkgs.pinentry.override { gcr = null; gtk2 = null; qt4 = null; };
+
pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; };
};
};
}
+3 -5
pkgs/top-level/all-packages.nix
···
pinentry = callPackage ../tools/security/pinentry {
libcap = if stdenv.isDarwin then null else libcap;
qt4 = null;
-
gtk2 = null;
-
gcr = gnome3.gcr;
};
pinentry_ncurses = pinentry.override {
-
gcr = null;
+
gtk2 = null;
};
-
pinentry_gtk2 = pinentry_ncurses.override {
-
inherit gtk2;
+
pinentry_gnome = pinentry_ncurses.override {
+
gcr = gnome3.gcr;
};
pinentry_qt4 = pinentry_ncurses.override {