diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-12-14 20:10:48 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-12-15 00:41:07 +0100 |
| commit | 8da6dfb0bbb00c330bfa053741f5a58b66219463 (patch) | |
| tree | d16b107216909d2a02b451d5657edccd4ef481e9 /gnu/packages/version-control.scm | |
| parent | a284e56de44717f1ad4aa884a1777441324738f2 (diff) | |
| download | guix-8da6dfb0bbb00c330bfa053741f5a58b66219463.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d7ea61e5fb..bc999bf3dc 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 |