me/guix
Archived
1
0
Fork 0
Code Activity

gnu: vulkan-loader: Update to 1.2.202.

Browse source 
* 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.
This commit is contained in:
Kaelyn Takata 2022-09-01 16:27:09 +00:00 • committed by Maxim Cournoyer
parent 86cf8bac6a
commit c4fec03621
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/vulkan.scm
View file

@ -204,7 +204,7 @@ interpretation of the specifications for these languages.")
(define-public vulkan-loader (define-public vulkan-loader
(package (package
(name "vulkan-loader") (name "vulkan-loader")
(version "1.2.162") (version "1.2.202")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -214,32 +214,23 @@ interpretation of the specifications for these languages.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"15gx9ab6w1sjq9hkpbas7z2f8f47j6mlln6p3w26qmydjj8gfjjv")))) "1vsaa16clncz19lihgj39rdg4dspkxjay1ii6pkf6fpl1vkw1dh2"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
,#~(list ,#~(list
(string-append "-DVULKAN_HEADERS_INSTALL_DIR=" (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
#$(this-package-input "vulkan-headers")) #$(this-package-input "vulkan-headers"))
(string-append "-DCMAKE_INSTALL_INCLUDEDIR=" (string-append "-DGOOGLETEST_INSTALL_DIR="
#$(this-package-input "vulkan-headers") (getcwd) "/source/external/googletest")
"/include")) "-DBUILD_TESTS=ON")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'unpack-googletest (add-after 'unpack 'unpack-googletest
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((gtest (assoc-ref inputs "googletest:source"))) (let ((gtest (assoc-ref inputs "googletest:source")))
(when gtest (when gtest
(copy-recursively gtest "external/googletest")) (copy-recursively gtest "external/googletest"))
#t))) #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)))))
(native-inputs (native-inputs
`(("googletest:source" ,(package-source googletest)) `(("googletest:source" ,(package-source googletest))
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)