From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Mon, 23 Oct 2023 15:55:24 +0800 Subject: [PATCH] Revert "Force usage of GSL fork because of a libstdc++ bug." This reverts commit 982546b169df3d479e6511425870327559b38a89. --- external/gsl/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/external/gsl/CMakeLists.txt b/external/gsl/CMakeLists.txt index 8eaf19c5..344f9488 100644 --- a/external/gsl/CMakeLists.txt +++ b/external/gsl/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(external_gsl INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_gsl ALIAS external_gsl) -#[[ if (DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED_LAZY) find_package(Microsoft.GSL 4.0.0 QUIET) @@ -20,7 +19,6 @@ if (DESKTOP_APP_USE_PACKAGED) return() endif() endif() -]] # https://gitlab.kitware.com/cmake/cmake/-/issues/25222 if (NOT EXISTS ${third_party_loc}/GSL/include) aryrefslogtreecommitdiff
path: root/gnu/packages/vulkan.scm
AgeCommit message (Expand)Author
2024-11-05gnu: volk: Hard-code path of vulkan-loader for dynamic loading...Until now, we’d get: $ guix shell vulkan-tools -- vulkaninfo ERROR at /tmp/guix-build-vulkan-tools-1.3.280.0.drv-0/source/vulkaninfo/./vulkaninfo.h:412: Failed to initialize: Vulkan loader is not installed, not found, or failed to load. This patch fixes it and potentially for other programs as well. * gnu/packages/vulkan.scm (volk)[arguments]: use gexp. <#:phases>: Patch dlopen with libvulkan.so. [input]: Add vulkan-loader. Change-Id: I5ef0eb13d35e517b8947faddace641882a775b80 Co-authored-by: Ludovic Courtès <ludo@gnu.org> Signed-off-by: John Kehayias <john.kehayias@protonmail.com> nathan
2024-11-05gnu: vulkan-headers: Hard-code libvulkan.so file name....* gnu/packages/vulkan.scm (vulkan-headers): Rename to… (vulkan-headers/no-loader): … this. (vulkan-headers): New variable. (vulkan-loader): Depend on ‘vulkan-headers/no-loader’. Change-Id: Ic674a4d965d8049e388d75137111ed0253ca3b18 Co-authored-by: Ludovic Courtès <ludo@gnu.org> Signed-off-by: John Kehayias <john.kehayias@protonmail.com> nathan
2024-08-31gnu: mesa: Fix building on aarch64-linux....* gnu/packages/gl.scm (mesa)[inputs]: When building for aarch64-linux use clang-18 and llvm-18 instead of llvm-for-mesa. [native-inputs]: When building for aarch64-linux add libclc. [arguments]: Adjust the 'disable-failing-test phase when building for aarch64-linux to skip a test. (mesa-opencl)[native-inputs]: When building for aarch64-linux don't add clang-15. * gnu/packages/check.scm (python-lit), * gnu/packages/llvm.scm (libclc), * gnu/packages/vulkan.scm (spirv-llvm-translator): Add a note about it being a dependency for mesa. Change-Id: I0bf5ab019ffd0626ad2d0c38bafceec401e3c886 Efraim Flashner
2024-08-17gnu: Add vkbasalt....* gnu/packages/vulkan.scm: (vkbasalt): New variable. Change-Id: Ib5a39df0deabb166498e16e7359e7fa83a63b6c9 Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn> James Smith via Guix-patches via
2024-08-11gnu: 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> Zheng Junjie