guix-commits
[Top][All Lists]
Advanced

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

01/04: gnu: libgit2: Allow cross-compilation.


From: guix-commits
Subject: 01/04: gnu: libgit2: Allow cross-compilation.
Date: Tue, 14 Dec 2021 18:42:24 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 8da6dfb0bbb00c330bfa053741f5a58b66219463
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Dec 14 20:10:48 2021 +0100

    gnu: libgit2: Allow cross-compilation.
    
    With commit 8394619baceb118df92e355377fd543bb1aa501a, the label for
    'pkg-config' when cross-compiling changed to "TRIPLET-pkg-config",
    thereby breaking the 'assoc-ref' call.  This commit fixes it by avoiding
    referring to the label.
    
    * gnu/packages/version-control.scm (libgit2)[arguments]: Adjust
    "-DPKG_CONFIG_EXECUTABLE=" option.
---
 gnu/packages/version-control.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index d7ea61e..bc999bf 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -811,8 +811,10 @@ to GitHub contributions calendar.")
              ,@(if (%current-target-system)
                    `((string-append
                       "-DPKG_CONFIG_EXECUTABLE="
-                      (assoc-ref %build-inputs "pkg-config")
-                      "/bin/" ,(%current-target-system) "-pkg-config"))
+                      (search-input-file
+                       %build-inputs
+                       (string-append "/bin/" ,(%current-target-system)
+                                      "-pkg-config"))))
                    '()))
        #:phases
        (modify-phases %standard-phases



reply via email to

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