02/02: gnu: gnupg: Add support for pcsc-lite.

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit cd9ed6c1cbd9fdcfa38825b8109a646fb968b7a8
Author: Mike Gerwitz <address@hidden>
Date:   Sat Oct 22 12:06:02 2016 -0400

    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 <address@hidden>
---
 gnu/packages/gnupg.scm |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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