ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

gnupg: Fix default path to pcsclite

Browse Source 
(cherry picked from commit 9631f5a718)

Conflicts:
	pkgs/tools/security/gnupg/20.nix
This commit is contained in:
William A. Kennington III 2015-03-09 15:16:03 -07:00 committed by Lluís Batlle i Rossell
parent cb21db1c77
commit 4f00f1e1a2
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
, libksba, coreutils, libiconvOrEmpty
, libksba, coreutils, libiconvOrEmpty, pcsclite
# Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality.
, pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
patchPhase = ''
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
patch gl/stdint_.h < ${./clang.patch}
'';

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

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