nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gnupg: Add support for pcsc-lite. 

* gnu/packages/gnupg.scm (gnupg)[inputs]: Add pcsc-lite.
[arguments]: Rename phase 'patch-config-files' to 'patch-paths'.  Patch
`scd/scdaemon.c' with absolute path of libpcsclite.so.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
This commit is contained in:
Mike Gerwitz 2016-10-22 12:06:02 -04:00 committed by Marius Bakke
parent a6b256affc
commit cd9ed6c1cb
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/gnupg.scm
View File

@ -9,6 +9,7 @@
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Nils Gillmann <ng0@libertad.pw> ;;; Copyright © 2016 Nils Gillmann <ng0@libertad.pw>
;;; Copyright © 2016 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2016 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2016 Mike Gerwitz <mtg@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -43,6 +44,7 @@
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages security-token)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
@ -261,6 +263,7 @@ compatible to GNU Pth.")
("libksba" ,libksba) ("libksba" ,libksba)
("npth" ,npth) ("npth" ,npth)
("openldap" ,openldap) ("openldap" ,openldap)
("pcsc-lite" ,pcsc-lite)
("readline" ,readline) ("readline" ,readline)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -268,10 +271,14 @@ compatible to GNU Pth.")
`(#:configure-flags '("--enable-gpg2-is-gpg") `(#:configure-flags '("--enable-gpg2-is-gpg")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-config-files (add-before 'configure 'patch-paths
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "tests/openpgp/defs.inc" (substitute* "tests/openpgp/defs.inc"
(("/bin/pwd") (which "pwd"))) (("/bin/pwd") (which "pwd")))
(substitute* "scd/scdaemon.c"
(("\"(libpcsclite\\.so[^\"]*)\"" _ name)
(string-append "\"" (assoc-ref inputs "pcsc-lite")
"/lib/" name "\"")))
#t))))) #t)))))
(home-page "https://gnupg.org/") (home-page "https://gnupg.org/")
(synopsis "GNU Privacy Guard") (synopsis "GNU Privacy Guard")