diff options
author | Tad Fisher <tadfisher@gmail.com> | 2018-02-14 11:33:09 -0800 |
---|---|---|
committer | Tad Fisher <tadfisher@gmail.com> | 2018-02-14 11:33:09 -0800 |
commit | 616255adf3128e3883f36a0fca4ae02530a70a14 (patch) | |
tree | d368f7fdaeeecbfae01b1ce64277d22807db3eab /pkgs | |
parent | ef9666e0256bdb944901abd58fecd1d8f113f35b (diff) | |
download | nixlib-616255adf3128e3883f36a0fca4ae02530a70a14.tar nixlib-616255adf3128e3883f36a0fca4ae02530a70a14.tar.gz nixlib-616255adf3128e3883f36a0fca4ae02530a70a14.tar.bz2 nixlib-616255adf3128e3883f36a0fca4ae02530a70a14.tar.lz nixlib-616255adf3128e3883f36a0fca4ae02530a70a14.tar.xz nixlib-616255adf3128e3883f36a0fca4ae02530a70a14.tar.zst nixlib-616255adf3128e3883f36a0fca4ae02530a70a14.zip |
pinentry: add option to enable pinentry-emacs
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index c551a8161aa2..839fb92238fe 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -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") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4c48fce84f0..2eeb8961b8ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4145,6 +4145,10 @@ with pkgs; gtk2 = null; }; + pinentry_emacs = pinentry_ncurses.override { + enableEmacs = true; + }; + pinentry_gnome = pinentry_ncurses.override { gcr = gnome3.gcr; }; |