From 75bf151d251e3dc03e3188991f36c482f6eeed7d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 18 Jul 2017 04:32:36 +0200
Subject: [PATCH] pinentry: fix configure arguments

pinentry 0.9.6 changed the `qt4` flag to just `qt`. Additionally,
the `--with-x` option has not been there for a while. This commit
renames and removes the flags, respectively.
---
 pkgs/tools/security/pinentry/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 51fd4714161..10a9d3504ac 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -6,7 +6,6 @@ let
   mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}";
   mkEnable = mkFlag "enable" "disable";
   mkWith = mkFlag "with" "without";
-  hasX = gtk2 != null || gcr != null || qt4 != null;
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -40,12 +39,11 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     (mkWith   (libcap != null)  "libcap")
-    (mkWith   (hasX)            "x")
     (mkEnable (ncurses != null) "pinentry-curses")
     (mkEnable true              "pinentry-tty")
     (mkEnable (gtk2 != null)    "pinentry-gtk2")
     (mkEnable (gcr != null)     "pinentry-gnome3")
-    (mkEnable (qt4 != null)     "pinentry-qt4")
+    (mkEnable (qt4 != null)     "pinentry-qt")
   ];
 
   nativeBuildInputs = [ pkgconfig ];