guix_mirror_bot pushed a commit to branch mesa-updates
in repository guix.
commit 958d53a2cde5b1a84fa51c3017d32dae43377ebe
Author: Cayetano Santos <csant...@inventati.org>
AuthorDate: Fri Aug 8 09:56:12 2025 +0200
gnu: glslang: Improve style.
* gnu/packages/vulkan.scm (glslang)[arguments]: Use Gexp.
[native-inputs]: Remove python; add python-minimal.
Change-Id: I7b4f236b984b85d12f76f9d8de2b627e005bd232
Signed-off-by: Maxim Cournoyer <ma...@guixotic.coop>
---
gnu/packages/vulkan.scm | 51 ++++++++++++++++++++++++++-----------------------
1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 0a8dfbc0f1..c430184486 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -229,32 +229,35 @@ translation between LLVM IR and SPIR-V.")
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"
- "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON"
- ,@(if (target-riscv64?)
- `("-DCMAKE_EXE_LINKER_FLAGS=-latomic")
- '()))
- #:phases (modify-phases %standard-phases
- ,@(if (target-ppc32?)
- `((add-after 'unpack 'skip-failing-test
- (lambda _
- ;; TODO: Figure out why this test fails.
- (substitute* "Test/runtests"
- ((".*remap\\.invalid" all)
- (string-append "# " all))))))
- '())
- (replace 'check
- (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
- (when tests?
- (invoke "ctest"
- "-j" (if parallel-tests?
- (number->string (parallel-job-count))
- "1")
- "--rerun-failed"
- "--output-on-failure")))))))
+ (list
+ #:configure-flags
+ #~(list "-DBUILD_SHARED_LIBS=ON"
+ "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON"
+ #$@(if (target-riscv64?)
+ `("-DCMAKE_EXE_LINKER_FLAGS=-latomic")
+ '()))
+ #:phases
+ #~(modify-phases %standard-phases
+ #$@(if (target-ppc32?)
+ `((add-after 'unpack 'skip-failing-test
+ (lambda _
+ ;; TODO: Figure out why this test fails.
+ (substitute* "Test/runtests"
+ ((".*remap\\.invalid" all)
+ (string-append "# " all))))))
+ '())
+ (replace 'check
+ (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
+ (when tests?
+ (invoke "ctest"
+ "-j" (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")
+ "--rerun-failed"
+ "--output-on-failure")))))))
(inputs (list spirv-tools))
(native-inputs
- (list pkg-config python))
+ (list pkg-config python-minimal))
(home-page "https://github.com/KhronosGroup/glslang";)
(synopsis "OpenGL and OpenGL ES shader front end and validator")
(description
