guix-commits
[Top][All Lists]
Advanced

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

02/02: gnu: libfido2: Fix cross-compilation.


From: guix-commits
Subject: 02/02: gnu: libfido2: Fix cross-compilation.
Date: Thu, 31 Mar 2022 13:10:43 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit fc94e93c4b60addfda3c1eddfb85907e9459a8af
Author: S├ębastien Lerique <sl@eauchat.org>
AuthorDate: Sun Mar 27 22:00:04 2022 +0900

    gnu: libfido2: Fix cross-compilation.
    
    * gnu/packages/security-token.scm (libfido2)[arguments]: Set the
    PKG_CONFIG_EXECUTABLE variable.
    
    Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/security-token.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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))))



reply via email to

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