[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/14: gnu: vulkan-loader: Fix cross-compilation.
From: |
guix-commits |
Subject: |
05/14: gnu: vulkan-loader: Fix cross-compilation. |
Date: |
Sun, 11 Aug 2024 06:26:22 -0400 (EDT) |
cbaines pushed a commit to branch master
in repository guix.
commit 0f82dfeb0abe2d1d7a0fc45d7e164c3842234820
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Sat Aug 3 10:23:54 2024 +0800
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>
---
gnu/packages/vulkan.scm | 8 ++++++--
1 file 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
- branch master updated (de714bcb46 -> 174ecf5b10), guix-commits, 2024/08/11
- 04/14: gnu: stress-ng: Don't stress test when building for riscv64-linux., guix-commits, 2024/08/11
- 09/14: gnu: chibi-scheme: Update to 0.11.0., guix-commits, 2024/08/11
- 13/14: gnu: ublock-origin: Update to 1.59.0., guix-commits, 2024/08/11
- 01/14: gnu: ola: Update to 0.10.9., guix-commits, 2024/08/11
- 03/14: gnu: llvm: Fix misc errors for unsupported targets., guix-commits, 2024/08/11
- 07/14: gnu: nheko: Add xdg-utils to dependencies., guix-commits, 2024/08/11
- 05/14: gnu: vulkan-loader: Fix cross-compilation.,
guix-commits <=
- 08/14: gnu: mg: Update to 20240709., guix-commits, 2024/08/11
- 12/14: gnu: noscript: Update to 11.4.31., guix-commits, 2024/08/11
- 02/14: gnu: xpra: Update to 6.1.0., guix-commits, 2024/08/11
- 06/14: gnu: zfs: Update to 2.2.5., guix-commits, 2024/08/11
- 14/14: gnu: luajit: Update to v2.1-0.04dca79., guix-commits, 2024/08/11
- 10/14: gnu: libfabric: Update to 1.22.0., guix-commits, 2024/08/11
- 11/14: gnu: ikiwiki: Update to 3.20200202.4., guix-commits, 2024/08/11