From 8feda47beee4ce96b009e9c855cfe849811cbcb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 26 Mar 2015 10:07:05 +0100
Subject: [PATCH] pinentry: fix build /cc wkennington

---
 pkgs/tools/security/pinentry/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix          | 4 ++--
 pkgs/top-level/release.nix               | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index dd17bdc4af74..632edaedd2ef 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -21,6 +21,7 @@ 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")
@@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
     homepage = "http://gnupg.org/aegypten2/";
     description = "GnuPG's interface to passphrase input";
     license = stdenv.lib.licenses.gpl2Plus;
-
+    platforms = stdenv.lib.platforms.all;
     longDescription = ''
       Pinentry provides a console and a GTK+ GUI that allows users to
       enter a passphrase when `gpg' or `gpg2' is run and needs it.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6ab84526cd0..0d2039624e04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2363,8 +2363,8 @@ let
   philter = callPackage ../tools/networking/philter { };
 
   pinentry = callPackage ../tools/security/pinentry {
-    gtk2 = !stdenv.isDarwin;
-    qt4 = stdenv.isDarwin;
+    gtk2 = if stdenv.isDarwin then null else gtk2;
+    qt4 = if stdenv.isDarwin then qt4 else null;
   };
 
   pius = callPackage ../tools/security/pius { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f2c3f88e6bda..cb469e613056 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -147,7 +147,6 @@ let
       pciutils = linux;
       pdf2xml = all;
       php = linux;
-      pinentry = linux;
       pltScheme = linux;
       pmccabe = linux;
       ppl = all;