TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 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"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
,#~(list
(string-append "-DVULKAN_HEADERS_INSTALL_DIR="
#$(this-package-input "vulkan-headers"))
(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))))))
(list
#:configure-flags
#~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
(dirname (dirname
(search-input-directory
%build-inputs "include/vulkan"))))
(string-append "-DGOOGLETEST_INSTALL_DIR="
(getcwd) "/source/external/googletest")
"-DBUILD_TESTS=ON")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'unpack-googletest
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((gtest (search-input-directory (or native-inputs inputs)
"googletest")))
(copy-recursively (dirname gtest)
"external/googletest")))))))
(native-inputs
`(("googletest:source" ,(package-source googletest))
("libxrandr" ,libxrandr)
("pkg-config" ,pkg-config)
("python" ,python)
("wayland" ,wayland)))
(list (package-source googletest)
libxrandr
pkg-config
python
wayland))
(inputs
(list vulkan-headers))
(home-page