diff mbox series

[bug#68134] gnu: vulkan-loader: Fix cross-compiling.

Message ID 0350fcf40aca2aea3e7eabfd11f6a8ab8c1f7a0f.1703914296.git.zhengjunjie@iscas.ac.cn
State New
Headers show
Series [bug#68134] gnu: vulkan-loader: Fix cross-compiling. | expand

Commit Message

Zheng Junjie Dec. 30, 2023, 5:31 a.m. UTC 
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(-)


base-commit: f76ca2b0e894c244d5011a32b30dee8fd874e322

Comments

Mathieu Othacehe Jan. 3, 2024, 2:27 p.m. UTC | #1 
> gnu/packages/vulkan.scm(vulkan-loader):
> [arguments]<#:configure-flags>: When cross-compiling, set -DBUILD_TESTS=OFF
> and -DUSE_GAS=OFF.
> [inputs]: Add libxrandr.

Applied, thanks,

Mathieu
diff mbox series

Patch

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 @@  (define-public vulkan-loader
                              (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 @@  (define-public vulkan-loader
            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")