From f29068a1de0e69a366fccdaec78567c30f52f081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 14 Jan 2010 22:47:30 +0000
Subject: [PATCH] Adding the pinentry dependency to opensc, so it properly
 calls at least one pinentry. The upstream opensc 0.11.7 does not allow
 choosing it at runtime!

svn path=/nixpkgs/trunk/; revision=19449
---
 pkgs/tools/security/opensc/0.11.7.nix | 5 +++--
 pkgs/top-level/all-packages.nix       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/opensc/0.11.7.nix b/pkgs/tools/security/opensc/0.11.7.nix
index 52a4d2af19a..af0bc5144a8 100644
--- a/pkgs/tools/security/opensc/0.11.7.nix
+++ b/pkgs/tools/security/opensc/0.11.7.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite, libassuan, pkgconfig,
-libXt}:
+libXt, pinentry}:
 
 stdenv.mkDerivation rec {
   name = "opensc-0.11.7";
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [ "--enable-pcsc" "--enable-nsplugin"
-    "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1" ];
+    "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1"
+    "--with-pinentry=${pinentry}/bin/pinentry" ];
 
   buildInputs = [ libtool readline zlib openssl pcsclite libassuan pkgconfig
     libXt ] ++
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68fe3c2d903..6285ea3faeb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1180,7 +1180,7 @@ let
 
   opensc_0_11_7 = import ../tools/security/opensc/0.11.7.nix {
     inherit fetchurl stdenv libtool readline zlib openssl libiconv pcsclite
-      libassuan pkgconfig;
+      libassuan pkgconfig pinentry;
     inherit (xlibs) libXt;
   };