aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZheng Junjie <zhengjunjie@iscas.ac.cn>2024-08-03 10:23:54 +0800
committerChristopher Baines <mail@cbaines.net>2024-08-11 10:49:27 +0100
commit0f82dfeb0abe2d1d7a0fc45d7e164c3842234820 (patch)
tree8d4bce7c2b4fa172e9d761abeae9c959aca4718f
parent7ad2bf9ded3ba14c355a67a03fda664fa3f97db4 (diff)
downloadguix-0f82dfeb0abe2d1d7a0fc45d7e164c3842234820.tar
guix-0f82dfeb0abe2d1d7a0fc45d7e164c3842234820.tar.gz
gnu: vulkan-loader: Fix cross-compilation.
* gnu/packages/vulkan.scm (vulkan-loader)[arguments]<#:configure>: When cross-compilation, set the PKG_CONFIG_EXECUTABLE variable. Change-Id: Ie0466a64effa5c93f859ff872423f2403f23f5cb Signed-off-by: Christopher Baines <mail@cbaines.net>
-rw-r--r--gnu/packages/vulkan.scm8
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 25542c1e06..8aee673653 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;; Copyright © 2022, 2024 dan <i@dan.games>
-;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -297,7 +297,11 @@ interpretation of the specifications for these languages.")
(search-input-directory
%build-inputs "include/vulkan"))))
#$@(if (%current-target-system)
- #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF")
+ #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF"
+ (string-append "-DPKG_CONFIG_EXECUTABLE="
+ (search-input-file
+ %build-inputs
+ (string-append "bin/" #$(pkg-config-for-target)))))
#~("-DBUILD_TESTS=ON")))
#:phases
#~(modify-phases %standard-phases