TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: vulkan-loader: Remove input labels.

Browse source 
* gnu/packages/vulkan.scm (vulkan-loader)[native-inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-DIRECTORY instead of label.  While at it remove
use of THIS-PACKAGE-INPUT.
This commit is contained in:
Marius Bakke 2022-11-20 20:56:27 +01:00 committed by Maxim Cournoyer
parent 4daa9c353f
commit c684e5f4e4
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gnu/packages/vulkan.scm
View file

@ -225,26 +225,29 @@ (define-public vulkan-loader
"0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2")))) "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list
,#~(list #:configure-flags
(string-append "-DVULKAN_HEADERS_INSTALL_DIR=" #~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
#$(this-package-input "vulkan-headers")) (dirname (dirname
(string-append "-DGOOGLETEST_INSTALL_DIR=" (search-input-directory
(getcwd) "/source/external/googletest") %build-inputs "include/vulkan"))))
"-DBUILD_TESTS=ON") (string-append "-DGOOGLETEST_INSTALL_DIR="
#:phases (modify-phases %standard-phases (getcwd) "/source/external/googletest")
(add-after 'unpack 'unpack-googletest "-DBUILD_TESTS=ON")
(lambda* (#:key inputs #:allow-other-keys) #:phases
(let ((gtest (assoc-ref inputs "googletest:source"))) #~(modify-phases %standard-phases
(when gtest (add-after 'unpack 'unpack-googletest
(copy-recursively gtest "external/googletest")) (lambda* (#:key native-inputs inputs #:allow-other-keys)
#t)))))) (let ((gtest (search-input-directory (or native-inputs inputs)
"googletest")))
(copy-recursively (dirname gtest)
"external/googletest")))))))
(native-inputs (native-inputs
`(("googletest:source" ,(package-source googletest)) (list (package-source googletest)
("libxrandr" ,libxrandr) libxrandr
("pkg-config" ,pkg-config) pkg-config
("python" ,python) python
("wayland" ,wayland))) wayland))
(inputs (inputs
(list vulkan-headers)) (list vulkan-headers))
(home-page (home-page