From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Gerwitz Subject: [PATCH 2/2] gnu: gnupg: patch scdaemon libpcsclite path Date: Sat, 22 Oct 2016 12:06:02 -0400 Message-ID: <0af65ca27af349d24cb59f9b824480f5d2bf9258.1477454587.git.mtg@gnu.org> References: <87mvht1zwh.fsf@duckhunt.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzFRs-0007Rl-GK for guix-devel@gnu.org; Wed, 26 Oct 2016 00:04:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzFRr-0000f0-Me for guix-devel@gnu.org; Wed, 26 Oct 2016 00:04:20 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55802) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzFRr-0000et-K9 for guix-devel@gnu.org; Wed, 26 Oct 2016 00:04:19 -0400 Received: from localhost ([::1]:41480 helo=mikegerwitz-pc.gerwitz.local) by fencepost.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bzFRr-0003kJ-Ap for guix-devel@gnu.org; Wed, 26 Oct 2016 00:04:19 -0400 In-Reply-To: <87mvht1zwh.fsf@duckhunt.i-did-not-set--mail-host-address--so-tickle-me> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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