summaryrefslogtreecommitdiff
path: root/gnu/packages/vulkan.scm
diff options
context:
space:
mode:
authordan <i@dan.games>2022-11-19 23:02:42 +0800
committerMarius Bakke <marius@gnu.org>2022-11-20 09:24:54 +0100
commit0ea4e5613c3a4d7d1099b251ebb3326c8da83c18 (patch)
treec9db8d7d5c7ca150bf7c7ae73d9b1e2f8d55bdd7 /gnu/packages/vulkan.scm
parentc764399db6d67bd95fefd3cf8727e86f2671a175 (diff)
gnu: shaderc: Update to 2022.3.
* gnu/packages/vulkan.scm (shaderc): Update to 2022.3. Signed-off-by: Marius Bakke <marius@gnu.org>
Diffstat (limited to 'gnu/packages/vulkan.scm')
-rw-r--r--gnu/packages/vulkan.scm16
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 5a2294d6bc..3440c671dc 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -296,7 +296,8 @@ API.")
(define-public shaderc
(package
(name "shaderc")
- (version "2021.3")
+ ;; shaderc doesn't follow the versioning scheme of vulkan sdk
+ (version "2022.3")
(source
(origin
(method git-fetch)
@@ -306,7 +307,7 @@ API.")
(file-name (git-file-name name version))
(sha256
(base32
- "0qjwixcx74dvx68jl51x2mp2q1346hvhwxr8w3wk36nzla62k2s6"))))
+ "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d"))))
(build-system cmake-build-system)
(arguments
`(;; FIXME: Skip most of the tests, because enabling system gtest breaks
@@ -338,7 +339,16 @@ API.")
,version
,(package-version spirv-tools)
,(package-version glslang))))
- #t)))))
+ #t))
+ ;; see: https://github.com/google/shaderc/pull/1276
+ (add-after 'do-not-look-for-bundled-sources 'drop-additional-glslang-deps
+ (lambda _
+ (substitute* "glslc/CMakeLists.txt"
+ (("OSDependent OGLCompiler") ""))
+ (substitute* "libshaderc/CMakeLists.txt"
+ (("OSDependent OGLCompiler") ""))
+ (substitute* "libshaderc_util/CMakeLists.txt"
+ (("OSDependent OGLCompiler") "")))))))
(inputs
(list glslang python spirv-headers spirv-tools))
(native-inputs