amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glslang: Improve style.

Browse source 
* gnu/packages/vulkan.scm (glslang)[arguments]: Use Gexp.
[native-inputs]: Remove python; add python-minimal.

Change-Id: I7b4f236b984b85d12f76f9d8de2b627e005bd232
Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop>
This commit is contained in:
Cayetano Santos 2025-08-08 09:56:12 +02:00 • committed by John Kehayias
parent 2c8dfc38fc
commit 1b9c7e32ef
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

51
gnu/packages/vulkan.scm
View file

@ -229,32 +229,35 @@ translation between LLVM IR and SPIR-V.")
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" (list
"-DALLOW_EXTERNAL_SPIRV_TOOLS=ON" #:configure-flags
,@(if (target-riscv64?) #~(list "-DBUILD_SHARED_LIBS=ON"
`("-DCMAKE_EXE_LINKER_FLAGS=-latomic") "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON"
'())) #$@(if (target-riscv64?)
#:phases (modify-phases %standard-phases `("-DCMAKE_EXE_LINKER_FLAGS=-latomic")
,@(if (target-ppc32?) '()))
`((add-after 'unpack 'skip-failing-test #:phases
(lambda _ #~(modify-phases %standard-phases
;; TODO: Figure out why this test fails. #$@(if (target-ppc32?)
(substitute* "Test/runtests" `((add-after 'unpack 'skip-failing-test
((".*remap\\.invalid" all) (lambda _
(string-append "# " all)))))) ;; TODO: Figure out why this test fails.
'()) (substitute* "Test/runtests"
(replace 'check ((".*remap\\.invalid" all)
(lambda* (#:key tests? parallel-tests? #:allow-other-keys) (string-append "# " all))))))
(when tests? '())
(invoke "ctest" (replace 'check
"-j" (if parallel-tests? (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
(number->string (parallel-job-count)) (when tests?
"1") (invoke "ctest"
"--rerun-failed" "-j" (if parallel-tests?
"--output-on-failure"))))))) (number->string (parallel-job-count))
"1")
"--rerun-failed"
"--output-on-failure")))))))
(inputs (list spirv-tools)) (inputs (list spirv-tools))
(native-inputs (native-inputs
(list pkg-config python)) (list pkg-config python-minimal))
(home-page "https://github.com/KhronosGroup/glslang") (home-page "https://github.com/KhronosGroup/glslang")
(synopsis "OpenGL and OpenGL ES shader front end and validator") (synopsis "OpenGL and OpenGL ES shader front end and validator")
(description (description