unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#68134] [PATCH] gnu: vulkan-loader: Fix cross-compiling.
@ 2023-12-30  5:31 Zheng Junjie
  2024-01-03 14:27 ` bug#68134: " Mathieu Othacehe
  0 siblings, 1 reply; 2+ messages in thread
From: Zheng Junjie @ 2023-12-30  5:31 UTC (permalink / raw)
  To: 68134

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1678 bytes --]

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 @@ (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")

base-commit: f76ca2b0e894c244d5011a32b30dee8fd874e322
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#68134: [PATCH] gnu: vulkan-loader: Fix cross-compiling.
  2023-12-30  5:31 [bug#68134] [PATCH] gnu: vulkan-loader: Fix cross-compiling Zheng Junjie
@ 2024-01-03 14:27 ` Mathieu Othacehe
  0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Othacehe @ 2024-01-03 14:27 UTC (permalink / raw)
  To: Zheng Junjie; +Cc: 68134-done


> 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




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-01-03 14:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-30  5:31 [bug#68134] [PATCH] gnu: vulkan-loader: Fix cross-compiling Zheng Junjie
2024-01-03 14:27 ` bug#68134: " Mathieu Othacehe

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).