Merge pull request #27468 from jtojnar/fix/pinentry-gnome

pinentry: add GNOME frontend
2017-10-02 07:29:23 -04:00
parent d8fe9476b7 3f7e3db744
commit 5af263c2af
4 changed files with 23 additions and 15 deletions
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3869,10 +3869,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_gtk2 = pinentry_ncurses.override {
+    inherit gtk2;
  };

  pinentry_qt4 = pinentry_ncurses.override {