about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2017-09-03 18:32:50 +0200
committerJan Tojnar <jtojnar@gmail.com>2017-10-01 01:40:03 +0200
commit3f7e3db74426f658b4625505d262c1f7b288606d (patch)
tree8b3cf20d062a89d6aa51dd1b78dcf3e0d1dc7312 /pkgs
parentb34a8912955ef23c166e4f3d0e5af42f1c10c24a (diff)
downloadnixlib-3f7e3db74426f658b4625505d262c1f7b288606d.tar
nixlib-3f7e3db74426f658b4625505d262c1f7b288606d.tar.gz
nixlib-3f7e3db74426f658b4625505d262c1f7b288606d.tar.bz2
nixlib-3f7e3db74426f658b4625505d262c1f7b288606d.tar.lz
nixlib-3f7e3db74426f658b4625505d262c1f7b288606d.tar.xz
nixlib-3f7e3db74426f658b4625505d262c1f7b288606d.tar.zst
nixlib-3f7e3db74426f658b4625505d262c1f7b288606d.zip
pinentry: make GTK3 the default front-end
See: https://github.com/NixOS/nixpkgs/issues/18559
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97815af90458..b778fa331462 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3860,14 +3860,16 @@ with pkgs;
   pinentry = callPackage ../tools/security/pinentry {
     libcap = if stdenv.isDarwin then null else libcap;
     qt4 = null;
+    gtk2 = null;
+    gcr = gnome3.gcr;
   };
 
   pinentry_ncurses = pinentry.override {
-    gtk2 = null;
+    gcr = null;
   };
 
-  pinentry_gnome = pinentry_ncurses.override {
-    gcr = gnome3.gcr;
+  pinentry_gtk2 = pinentry_ncurses.override {
+    inherit gtk2;
   };
 
   pinentry_qt4 = pinentry_ncurses.override {