diff options
| author | dan <i@dan.games> | 2024-03-28 11:54:45 +0800 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-04-01 00:27:22 -0400 |
| commit | 408a770c8fe4e36a375ad8254231c5a9a48cafd6 (patch) | |
| tree | cefc5dfef0b5e015df41275bf5b072389b582772 /gnu/packages/vulkan.scm | |
| parent | fb5299f54cbb53dc3bf2fb8d9b0f7901ffd7e22a (diff) | |
| download | guix-patches-408a770c8fe4e36a375ad8254231c5a9a48cafd6.tar guix-patches-408a770c8fe4e36a375ad8254231c5a9a48cafd6.tar.gz | |
gnu: glslang: Update to 1.3.280.0.
* gnu/packages/vulkan.scm (glslang): Update to 1.3.280.0.
[source]: Remove patch.
[arguments]: Run tests.
[inputs]: Add spirv-tools.
* gnu/packages/patches/glslang-install-static-libs.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Ungerister it.
Change-Id: I39ef23565e575179b292a1ab76d2d70c98f84767
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
Diffstat (limited to 'gnu/packages/vulkan.scm')
| -rw-r--r-- | gnu/packages/vulkan.scm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ade0f65665..499165f581 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -189,22 +189,27 @@ translation between LLVM IR and SPIR-V.") (define-public glslang (package (name "glslang") - (version %vulkan-sdk-version) + (version "1.3.280.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/glslang") - (commit version))) - (patches (search-patches "glslang-install-static-libs.patch")) + (commit (string-append "vulkan-sdk-" version)))) (sha256 (base32 - "12a1zl8qxa28nbf6m67260c0lwdw3bqbj0jz1382wgm5px1fpqw6")) + "1vvgqvwhsimlz8wkk38b9cvp9abggq840iws8al0znzz3mnvkfdn")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;FIXME: requires bundled SPIRV-Tools - #:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) + '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" + "-DALLOW_EXTERNAL_SPIRV_TOOLS=ON") + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest"))))))) + (inputs (list spirv-tools)) (native-inputs (list pkg-config python)) (home-page "https://github.com/KhronosGroup/glslang") |