diff options
Diffstat (limited to 'gnu/packages/security-token.scm')
| -rw-r--r-- | gnu/packages/security-token.scm | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index f8c9661df1..f722c27cd7 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Ludovic Courtès <[email protected]> +;;; Copyright © 2014, 2021 Ludovic Courtès <[email protected]> ;;; Copyright © 2016 Efraim Flashner <[email protected]> ;;; Copyright © 2016 Mike Gerwitz <[email protected]> ;;; Copyright © 2016 Marius Bakke <[email protected]> @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Arun Isaac <[email protected]> ;;; Copyright © 2020 Raphaël Mélotte <[email protected]> ;;; Copyright © 2021 Antero Mejr <[email protected]> +;;; Copyright © 2021 Brice Waegeneire <[email protected]> ;;; Copyright © 2021 Sergey Trofimov <[email protected]> ;;; ;;; This file is part of GNU Guix. @@ -224,14 +225,14 @@ with a PKCS #11 Cryptographic Token Interface.") (define-public pcsc-lite (package (name "pcsc-lite") - (version "1.9.0") + (version "1.9.1") (source (origin (method url-fetch) (uri (string-append "https://pcsclite.apdu.fr/files/" "pcsc-lite-" version ".tar.bz2")) (sha256 (base32 - "1y9f9zipnrmgiw0mxrvcgky8vfrcmg6zh40gbln5a93i2c1x8j01")))) + "0fk8bvjpcci43iq2jzlvkml8bzjxclhxlg291ykk7a3ng2dpii3k")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-usbdropdir=/var/lib/pcsc/drivers" @@ -302,8 +303,8 @@ website for more information about Yubico and the YubiKey.") ;; configuration file at runtime. (add-after 'unpack 'set-default-libpcsclite.so.1-path (lambda* (#:key inputs #:allow-other-keys) - (let ((libpcsclite (string-append (assoc-ref inputs "pcsc-lite") - "/lib/libpcsclite.so.1"))) + (let ((libpcsclite (search-input-file inputs + "/lib/libpcsclite.so.1"))) (substitute* "configure" (("DEFAULT_PCSC_PROVIDER=\"libpcsclite\\.so\\.1\"") (string-append @@ -441,8 +442,8 @@ retrieve a YubiKey's serial number, and so forth.") (("lib = \"libpcsclite\\.so\\.1\";") (simple-format #f "lib = \"~a\";" - (string-append (assoc-ref inputs "pcsc-lite") - "/lib/libpcsclite.so.1")))) + (search-input-file inputs + "/lib/libpcsclite.so.1")))) #t))))) (inputs `(("pcsc-lite" ,pcsc-lite))) @@ -613,10 +614,11 @@ your existing infrastructure.") (add-after 'unpack 'install-public-suffix-list (lambda* (#:key inputs #:allow-other-keys) (copy-file - (string-append (assoc-ref inputs "public-suffix-list") - "/share/public-suffix-list-" - ,(package-version public-suffix-list) - "/public_suffix_list.dat") + (search-input-file inputs + (string-append + "/share/public-suffix-list-" + ,(package-version public-suffix-list) + "/public_suffix_list.dat")) "fido2/public_suffix_list.dat") #t))))) (propagated-inputs |