diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-19 15:41:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-19 15:41:56 -0500 |
| commit | 35ebf5bfd963a77c1276658bd7dee3d923039010 (patch) | |
| tree | a4dc0fc07fb3a19b686b8ffb89739579965a87b8 /pkgs/tools/security/pinentry | |
| parent | 161253f0e0075163444e17eb1bde77ef4a4c8090 (diff) | |
| parent | 616255adf3128e3883f36a0fca4ae02530a70a14 (diff) | |
Merge pull request #34982 from tadfisher/pinentry-emacs
pinentry: add option to enable pinentry-emacs
Diffstat (limited to 'pkgs/tools/security/pinentry')
| -rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index ac00c1fd5443f..07cf15baa2244 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") |