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

gnupg: Fix default path to pcsclite

Browse Source
This commit is contained in:
William A. Kennington III 2015-03-09 15:16:03 -07:00
parent d388855731
commit 9631f5a718
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/security/gnupg/20.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan
, libksba, coreutils, libiconv , libksba, coreutils, libiconv, pcsclite
# Each of the dependencies below are optional. # Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality. # Gnupg can be built without them at the cost of reduced functionality.
, pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null , pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i
sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''
find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/' find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/'
'' + '' '' + ''

5
pkgs/tools/security/gnupg/21.nix
View File

@ -1,6 +1,7 @@
{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth
, readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null , readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null
, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext , zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext
, pcsclite
}: }:
with stdenv.lib; with stdenv.lib;
@ -14,6 +15,10 @@ stdenv.mkDerivation rec {
patches = [ ./socket-activate-2.1.1.patch ]; patches = [ ./socket-activate-2.1.1.patch ];
postPatch = ''
sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
'';
buildInputs = [ buildInputs = [
pkgconfig libgcrypt libassuan libksba npth pkgconfig libgcrypt libassuan libksba npth
readline libusb gnutls adns openldap zlib bzip2 readline libusb gnutls adns openldap zlib bzip2