mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-01 09:02:59 -05:00
gnu: vulkan-tools: Update to 1.3.280.0.
* gnu/packages/vulkan.scm (vulkan-tools): Update to 1.3.280.0. [source]: Add snippet to disable a test. [arguments]: Remove GLSLANG_INSTALL_DIR from configure-flags. Enable tests. Replace the check phase [native-inputs]: Add googletest. Change-Id: Iadf98fc95d0d70c3780159992ebc2fdff6a2d108 Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
This commit is contained in:
parent
083c9c0109
commit
74f849235a
1 changed files with 15 additions and 7 deletions
|
@ -327,26 +327,34 @@ (define-public vulkan-loader
|
|||
(define-public vulkan-tools
|
||||
(package
|
||||
(name "vulkan-tools")
|
||||
(version %vulkan-sdk-version)
|
||||
(version "1.3.280.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/KhronosGroup/Vulkan-Tools")
|
||||
(commit version)))
|
||||
(commit (string-append "vulkan-sdk-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet #~(substitute* "tests/icd/mock_icd_tests.cpp"
|
||||
;; Disable driver info test since it relies on git branch info
|
||||
(("ASSERT_EQ\\(std::string\\(driver_properties\\.driverInfo\\)")
|
||||
"// ASSERT_EQ(std::string(driver_properties.driverInfo)")))
|
||||
(sha256
|
||||
(base32
|
||||
"0jzwjfx4c7y15wkwfhhc64rzljpi47bxrm5jw5blfsqjh8zsd27a"))))
|
||||
"0w0m04vscr4a6vr682g3mn7mfni740cmai9ylzlgfdggb77y58xz"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
(list glslang libxrandr vulkan-loader wayland wayland-protocols))
|
||||
(native-inputs
|
||||
(list pkg-config python vulkan-headers))
|
||||
(list googletest pkg-config python volk vulkan-headers))
|
||||
(arguments
|
||||
`(#:tests? #f ;no tests
|
||||
#:configure-flags (list (string-append "-DGLSLANG_INSTALL_DIR="
|
||||
(assoc-ref %build-inputs "glslang")))))
|
||||
`(#:configure-flags (list "-DBUILD_TESTS=ON")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "./tests/vulkan_tools_tests")))))))
|
||||
(home-page
|
||||
"https://github.com/KhronosGroup/Vulkan-Tools")
|
||||
(synopsis "Tools and utilities for Vulkan")
|
||||
|
|
Loading…
Reference in a new issue