public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding the pinentry dependency to opensc, so it properly calls at least one pinentry.

Browse Source 
The upstream opensc 0.11.7 does not allow choosing it at runtime!


svn path=/nixpkgs/trunk/; revision=19449
This commit is contained in:
Lluís Batlle i Rossell 2010-01-14 22:47:30 +00:00
parent 9dfe94bc3c
commit f29068a1de
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/security/opensc/0.11.7.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite, libassuan, pkgconfig, {stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite, libassuan, pkgconfig,
libXt}: libXt, pinentry}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "opensc-0.11.7"; name = "opensc-0.11.7";
@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
}; };
configureFlags = [ "--enable-pcsc" "--enable-nsplugin" 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 buildInputs = [ libtool readline zlib openssl pcsclite libassuan pkgconfig
libXt ] ++ libXt ] ++

2
pkgs/top-level/all-packages.nix
View File

@ -1180,7 +1180,7 @@ let
opensc_0_11_7 = import ../tools/security/opensc/0.11.7.nix { opensc_0_11_7 = import ../tools/security/opensc/0.11.7.nix {
inherit fetchurl stdenv libtool readline zlib openssl libiconv pcsclite inherit fetchurl stdenv libtool readline zlib openssl libiconv pcsclite
libassuan pkgconfig; libassuan pkgconfig pinentry;
inherit (xlibs) libXt; inherit (xlibs) libXt;
}; };