From 89f3275ff5ecd3b3e95c9b66821a8541e0da2269 Mon Sep 17 00:00:00 2001 From: Sébastien Lerique Date: Sun, 27 Mar 2022 22:00:03 +0900 Subject: gnu: libfido2: Use new style for inputs. * gnu/packages/security-token.scm (libfido2)[inputs]: Use new style. Sort alphabetically. Signed-off-by: Efraim Flashner --- gnu/packages/security-token.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages/security-token.scm') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 129b8f6122..baa5255245 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -903,11 +903,7 @@ phone is required.") (file-name (git-file-name name version)) (sha256 (base32 "12zy4cnlcffcb64lsx8198y09j1dwi0bcn9rr82q6i1k950yzd3p")))) (native-inputs (list pkg-config)) - (inputs - `(("zlib" ,zlib) - ("udev" ,eudev) - ("libcbor" ,libcbor) - ("openssl" ,openssl))) + (inputs (list eudev libcbor openssl zlib)) (build-system cmake-build-system) (arguments '(#:phases -- cgit v1.2.3 From fc94e93c4b60addfda3c1eddfb85907e9459a8af Mon Sep 17 00:00:00 2001 From: Sébastien Lerique Date: Sun, 27 Mar 2022 22:00:04 +0900 Subject: gnu: libfido2: Fix cross-compilation. * gnu/packages/security-token.scm (libfido2)[arguments]: Set the PKG_CONFIG_EXECUTABLE variable. Signed-off-by: Efraim Flashner --- gnu/packages/security-token.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/security-token.scm') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index baa5255245..2cc1fa38c0 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -38,6 +38,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) @@ -906,7 +907,13 @@ phone is required.") (inputs (list eudev libcbor openssl zlib)) (build-system cmake-build-system) (arguments - '(#:phases + `(#:configure-flags + (list (string-append + "-DPKG_CONFIG_EXECUTABLE=" + (search-input-file %build-inputs + (string-append + "/bin/" ,(pkg-config-for-target))))) + #:phases (modify-phases %standard-phases ;; regress tests enabled only for debug builds (delete 'check)))) -- cgit v1.2.3 From b11719f12b7e4865bd434b33e8c6df84aaa87067 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:14:30 -0400 Subject: gnu: Remove python2-pyscard. * gnu/packages/security-token.scm (python2-pyscard): Delete variable. --- gnu/packages/security-token.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/security-token.scm') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 2cc1fa38c0..74ea57137f 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -446,9 +446,6 @@ aware applications in Python. The smart card module is built on top of the PCSC API Python wrapper module.") (license license:lgpl2.1+))) -(define-public python2-pyscard - (package-with-python2 python-pyscard)) - (define-public yubikey-oath-dmenu (package (name "yubikey-oath-dmenu") -- cgit v1.2.3