diff mbox series

[bug#57297,v2,4/7] gnu: vulkan-loader: Update to 1.2.202.

Message ID 5da294ee2052a5a5d1f1d2ca62c58c988d894c93.1662049085.git.kaelyn.alexi@protonmail.com
State Accepted
Headers show
Series Update vulkan packages and add vulkan-validationlayers | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git-branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git-branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Kaelyn Takata Sept. 1, 2022, 4:27 p.m. UTC 
* gnu/packages/vulkan.scm (vulkan-loader): Update to 1.2.202.
[arguments]: Enable tests by removing obsolete build phase
'disable-loader-tests and adjusting configure flags.
---
 gnu/packages/vulkan.scm | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

--
2.37.2
diff mbox series

Patch

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 61cbcf8411..74432298f8 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -207,7 +207,7 @@  (define-public vulkan-headers
 (define-public vulkan-loader
   (package
     (name "vulkan-loader")
-    (version "1.2.162")
+    (version "1.2.202")
     (source
      (origin
        (method git-fetch)
@@ -217,32 +217,23 @@  (define-public vulkan-loader
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "15gx9ab6w1sjq9hkpbas7z2f8f47j6mlln6p3w26qmydjj8gfjjv"))))
+         "1vsaa16clncz19lihgj39rdg4dspkxjay1ii6pkf6fpl1vkw1dh2"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
        ,#~(list
            (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
                           #$(this-package-input "vulkan-headers"))
-           (string-append "-DCMAKE_INSTALL_INCLUDEDIR="
-                          #$(this-package-input "vulkan-headers")
-                          "/include"))
+           (string-append "-DGOOGLETEST_INSTALL_DIR="
+                          (getcwd) "/source/external/googletest")
+           "-DBUILD_TESTS=ON")
        #:phases (modify-phases %standard-phases
                   (add-after 'unpack 'unpack-googletest
                     (lambda* (#:key inputs #:allow-other-keys)
                       (let ((gtest (assoc-ref inputs "googletest:source")))
                         (when gtest
                           (copy-recursively gtest "external/googletest"))
-                        #t)))
-                  (add-after 'unpack 'disable-loader-tests
-                    (lambda _
-                      ;; Many tests require a Vulkan driver.  Skip those.
-                      (substitute* "tests/loader_validation_tests.cpp"
-                        ((".*= vkCreateInstance.*" all)
-                         (string-append "GTEST_SKIP();\n" all))
-                        (("TEST_F.*InstanceExtensionEnumerated.*" all)
-                         (string-append all "\nGTEST_SKIP();\n")))
-                      #t)))))
+                        #t))))))
     (native-inputs
      `(("googletest:source" ,(package-source googletest))
        ("libxrandr" ,libxrandr)