guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 2/2] gnu: gnupg: patch scdaemon libpcsclite path


From: Mike Gerwitz
Subject: [PATCH 2/2] gnu: gnupg: patch scdaemon libpcsclite path
Date: Sat, 22 Oct 2016 12:06:02 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux)

* gnu/packages/gnupg.scm (gnupg): Use absolute path of pcsc-lite for
  libpcsclite in `scd/scdaemon.c'
---
 gnu/packages/gnupg.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index da48e26..52af7c0 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -293,6 +293,7 @@ compatible to GNU Pth.")
        ("libksba" ,libksba)
        ("npth" ,npth)
        ("openldap" ,openldap)
+       ("libpcsclite" ,pcsc-lite)
        ("readline" ,readline)
        ("sqlite" ,sqlite)
        ("zlib" ,zlib)))
@@ -301,9 +302,15 @@ compatible to GNU Pth.")
       #:phases
       (modify-phases %standard-phases
         (add-before 'configure 'patch-config-files
-          (lambda _
+          (lambda* (#:key inputs outputs #:allow-other-keys)
             (substitute* "tests/openpgp/defs.inc"
               (("/bin/pwd") (which "pwd")))
+            (substitute* "scd/scdaemon.c"
+              (("\"(libpcsclite\\.so[^\"]*)\"" _ name)
+               (string-append "\""
+                              (assoc-ref inputs "libpcsclite")
+                              "/lib/" name
+                              "\"")))
             #t)))))
     (home-page "https://gnupg.org/";)
     (synopsis "GNU Privacy Guard")
-- 
2.9.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]