diff options
| -rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 667831373c55..51fd47141611 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,12 +1,12 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, ncurses ? null, gtk2 ? null, qt4 ? null +, libgpgerror, libassuan, libcap ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt4 ? null }: let mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; mkEnable = mkFlag "enable" "disable"; mkWith = mkFlag "with" "without"; - hasX = gtk2 != null || qt4 != null; + hasX = gtk2 != null || gcr != null || qt4 != null; in with stdenv.lib; stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0ni7g4plq6x78p32al7m8h2zsakvg1rhfz0qbc3kdc7yq7nw4whn"; }; - buildInputs = [ libgpgerror libassuan libcap gtk2 ncurses qt4 ]; + buildInputs = [ libgpgerror libassuan libcap gtk2 gcr ncurses qt4 ]; prePatch = '' substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { (mkEnable (ncurses != null) "pinentry-curses") (mkEnable true "pinentry-tty") (mkEnable (gtk2 != null) "pinentry-gtk2") + (mkEnable (gcr != null) "pinentry-gnome3") (mkEnable (qt4 != null) "pinentry-qt4") ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fced3a1bb81..97815af90458 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3866,6 +3866,10 @@ with pkgs; gtk2 = null; }; + pinentry_gnome = pinentry_ncurses.override { + gcr = gnome3.gcr; + }; + pinentry_qt4 = pinentry_ncurses.override { inherit qt4; }; |