diff options
| author | Kaelyn Takata <kaelyn.alexi@protonmail.com> | 2022-09-01 16:27:09 +0000 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 15:10:50 -0400 |
| commit | c4fec03621c4ad3a5a27a46aef96a7ce894d51f7 (patch) | |
| tree | 3667a974c7b86c3658a32faef802c3f92ea7a6fb | |
| parent | 86cf8bac6a512c3520ab3a48d41e6be9478934ae (diff) | |
| download | guix-c4fec03621c4ad3a5a27a46aef96a7ce894d51f7.tar.gz | |
gnu: vulkan-loader: Update to 1.2.202.
* 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.
| -rw-r--r-- | gnu/packages/vulkan.scm | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 9e9174ca7e..6519f34f20 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -204,7 +204,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-loader (package (name "vulkan-loader") - (version "1.2.162") + (version "1.2.202") (source (origin (method git-fetch) @@ -214,32 +214,23 @@ interpretation of the specifications for these languages.") (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) |