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

Merge pull request #34982 from tadfisher/pinentry-emacs

Browse Source 
pinentry: add option to enable pinentry-emacs
This commit is contained in:
Matthew Justin Bauer 2018-03-19 15:41:56 -05:00 committed by GitHub
commit 35ebf5bfd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/security/pinentry/default.nix
View File

@ -1,5 +1,6 @@
{ fetchurl, fetchpatch, stdenv, lib, pkgconfig
, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null
, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null
, enableEmacs ? false
}:
let
@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
(mkEnable (libsecret != null) "libsecret")
(mkEnable (ncurses != null) "pinentry-curses")
(mkEnable true "pinentry-tty")
(mkEnable enableEmacs "pinentry-emacs")
(mkEnable (gtk2 != null) "pinentry-gtk2")
(mkEnable (gcr != null) "pinentry-gnome3")
(mkEnable (qt != null) "pinentry-qt")

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

@ -4242,6 +4242,10 @@ with pkgs;
gtk2 = null;
};
pinentry_emacs = pinentry_ncurses.override {
enableEmacs = true;
};
pinentry_gnome = pinentry_ncurses.override {
gcr = gnome3.gcr;
};