JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 3f7e3db744.

This broke the gpg-agent user service. See #27468.
This commit is contained in:
Franz Pletz 2017-10-04 02:15:48 +02:00
parent 05ab1e0e48
commit eb59961855
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/no-x-libs.nix
View File

@ -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; };
};
};
}

8
pkgs/top-level/all-packages.nix
View File

@ -3871,16 +3871,14 @@ 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 {
gcr = null;
gtk2 = null;
};
pinentry_gtk2 = pinentry_ncurses.override {
inherit gtk2;
pinentry_gnome = pinentry_ncurses.override {
gcr = gnome3.gcr;
};
pinentry_qt4 = pinentry_ncurses.override {