guix-commits
[Top][All Lists]
Advanced

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

02/08: gnu: vulkan-loader: Fix cross-compiling.


From: guix-commits
Subject: 02/08: gnu: vulkan-loader: Fix cross-compiling.
Date: Wed, 3 Jan 2024 09:32:29 -0500 (EST)

mothacehe pushed a commit to branch master
in repository guix.

commit 80f6e5a9ea87bb6665d6323c5a73ad5e929409fa
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Sat Dec 30 13:31:36 2023 +0800

    gnu: vulkan-loader: Fix cross-compiling.
    
    gnu/packages/vulkan.scm(vulkan-loader):
    [arguments]<#:configure-flags>: When cross-compiling, set -DBUILD_TESTS=OFF
    and -DUSE_GAS=OFF.
    [inputs]: Add libxrandr.
    
    Change-Id: I580e1c77c4b9b5a3483e93ff9eda78fbe07ec292
---
 gnu/packages/vulkan.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index ca771a30b1..285d6be7f5 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
 ;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com>
 ;;; Copyright © 2022 dan <i@dan.games>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -270,7 +271,9 @@ interpretation of the specifications for these languages.")
                              (dirname (dirname
                                        (search-input-directory
                                         %build-inputs "include/vulkan"))))
-              "-DBUILD_TESTS=ON")
+              #$@(if (%current-target-system)
+                     #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF")
+                     #~("-DBUILD_TESTS=ON")))
        #:phases
        #~(modify-phases %standard-phases
            (add-after 'unpack 'fix-pkg-config-file
@@ -299,7 +302,7 @@ interpretation of the specifications for these languages.")
            python
            wayland))
     (inputs
-     (list vulkan-headers))
+     (list vulkan-headers libxrandr))
     (home-page
      "https://github.com/KhronosGroup/Vulkan-Loader";)
     (synopsis "Khronos official ICD loader and validation layers for Vulkan")



reply via email to

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