guix-commits
[Top][All Lists]
Advanced

[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



reply via email to

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