about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-10-04 02:15:48 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2017-10-04 02:16:37 +0200
commiteb59961855cf2c76aa4016c33323931d1d760445 (patch)
tree6f5dfb0d98473835d4de8dcd3f227a61a2692c95 /nixos
parent05ab1e0e48896063810cf6658847a9e6a5a4c454 (diff)
downloadnixlib-eb59961855cf2c76aa4016c33323931d1d760445.tar
nixlib-eb59961855cf2c76aa4016c33323931d1d760445.tar.gz
nixlib-eb59961855cf2c76aa4016c33323931d1d760445.tar.bz2
nixlib-eb59961855cf2c76aa4016c33323931d1d760445.tar.lz
nixlib-eb59961855cf2c76aa4016c33323931d1d760445.tar.xz
nixlib-eb59961855cf2c76aa4016c33323931d1d760445.tar.zst
nixlib-eb59961855cf2c76aa4016c33323931d1d760445.zip
Revert "pinentry: make GTK3 the default front-end"
This reverts commit 3f7e3db74426f658b4625505d262c1f7b288606d.

This broke the gpg-agent user service. See #27468.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/config/no-x-libs.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index ec3103b4a401..ae3e17ac27b6 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -35,7 +35,7 @@ with lib;
       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; };
     };
   };
 }