summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorRutger Helling <rhelling@mykolab.com>2018-02-23 12:25:10 +0100
committerRutger Helling <rhelling@mykolab.com>2018-02-23 18:17:37 +0100
commita512246ccd77b8b3c680c6f99bddd5da45a6b877 (patch)
treed23fa867323dd9d0f1a36701f53cd1608db8f121 /gnu
parent8572adb28a27e8324d2a2e54dac0669b43603789 (diff)
downloadguix-a512246ccd77b8b3c680c6f99bddd5da45a6b877.tar.gz
gnu: vulkan-icd-loader: Update to 1.0.68.0.
* gnu/packages/vulkan.scm (vulkan-icd-loader): Update to 1.0.68.0.
[arguments]: Add 'remove-spirv-tools-commit-id phase. Add "-DBUILD_LAYERS=OFF"
configure-flag.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/vulkan.scm15
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 4185064d8d..1d83b6f363 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -158,7 +158,7 @@ interpretation of the specifications for these languages.")
 (define-public vulkan-icd-loader
   (package
     (name "vulkan-icd-loader")
-    (version "1.0.65.2")
+    (version "1.0.68.0")
     (source
      (origin
        (method url-fetch)
@@ -167,11 +167,20 @@ interpretation of the specifications for these languages.")
              "archive/sdk-" version ".tar.gz"))
        (sha256
         (base32
-         "1ivvmb977n2xp95v3sryhflvryy3mxrcwrd1hnr2dmri40vg1sl8"))))
+         "1n5gry5zxpwi7330fmi06snalra8hkbbw68gnwbp531kd5ycyinh"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ;FIXME: 23/39 tests fail.  Try "tests/run_all_tests.sh".
-       #:configure-flags (list (string-append "-DCMAKE_INSTALL_LIBDIR="
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'remove-spirv-tools-commit-id
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Remove lines trying to build in a git commit id.
+             (substitute* "CMakeLists.txt" ((".*spirv_tools_commit_id.h.*") ""))
+             #t)))
+       #:configure-flags (list
+                          "-DBUILD_LAYERS=OFF" ; FIXME: Fails to build.
+                          (string-append "-DCMAKE_INSTALL_LIBDIR="
                                               (assoc-ref %outputs "out") "/lib"))))
     (inputs `(("glslang" ,glslang)
               ("libxcb" ,libxcb)