summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-12-12 19:13:02 +0100
committerMarius Bakke <marius@gnu.org>2020-12-13 21:44:12 +0100
commit8f8185b996036be7100b3016f27accec76ccd094 (patch)
treefe449af0819f9624f90a7f012c5ffbcca8ba4a86
parent9045b3bb34a9514d0e6dc122e7b5d9be8c29cd32 (diff)
downloadguix-8f8185b996036be7100b3016f27accec76ccd094.tar.gz
gnu: shaderc: Update to 2020.4.
* gnu/packages/vulkan.scm (shaderc): Update to 2020.4.
[arguments]: Add "-Dglslang_SOURCE_DIR" in #:configure-flags.
-rw-r--r--gnu/packages/vulkan.scm10
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index ea22a7be0c..ca359e4923 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -298,7 +298,7 @@ API.")
 (define-public shaderc
   (package
     (name "shaderc")
-    (version "2020.0")
+    (version "2020.4")
     (source
      (origin
        (method git-fetch)
@@ -308,12 +308,16 @@ API.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1kqqvsvib01bsmfbdy3fbwwpvkcdlfb6k71kjvzb3crql7w0rxff"))))
+         "07h78nd964h2bdm4drzws8i1gvyal8a3wlhbcm5qxqk6vknv8hrk"))))
     (build-system cmake-build-system)
     (arguments
      `(;; FIXME: Skip most of the tests, because enabling system gtest breaks
        ;; the build: <https://github.com/google/shaderc/issues/470>.
-       #:configure-flags '("-DSHADERC_SKIP_TESTS=ON")
+       #:configure-flags
+       (list "-DSHADERC_SKIP_TESTS=ON"
+             ;; Note: despite the name, this just specifies the headers.
+             (string-append "-Dglslang_SOURCE_DIR="
+                            (assoc-ref %build-inputs "glslang") "/include/glslang"))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'do-not-look-for-bundled-sources