amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: vulkan-loader: Improve style.

Browse source 
* gnu/packages/vulkan.scm (vulkan-loader): Fix max column.

Change-Id: I613ef9c8b87200168af3ab4c0379b0c8b2d09c58
Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop>
This commit is contained in:
Cayetano Santos 2025-08-08 10:26:57 +02:00 • committed by Andreas Enge
parent 6b62d7d3ed
commit bd38a9eca3
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

50
gnu/packages/vulkan.scm
View file

@ -394,31 +394,33 @@ Enhanced Subpixel Morphological Anti-Aliasing
%build-inputs "include/vulkan")))) %build-inputs "include/vulkan"))))
#$@(if (%current-target-system) #$@(if (%current-target-system)
#~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF" #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF"
(string-append "-DPKG_CONFIG_EXECUTABLE=" (string-append
(search-input-file "-DPKG_CONFIG_EXECUTABLE="
%build-inputs (search-input-file
(string-append "bin/" #$(pkg-config-for-target))))) %build-inputs
(string-append "bin/" #$(pkg-config-for-target)))))
#~("-DBUILD_TESTS=ON"))) #~("-DBUILD_TESTS=ON")))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-pkg-config-file (add-after 'unpack 'fix-pkg-config-file
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((vulkan-headers (dirname (search-input-directory (let ((vulkan-headers (dirname (search-input-directory
inputs "include/vulkan")))) inputs "include/vulkan"))))
;; Ensure the pkg-config file refers to vulkan-headers. ;; Ensure the pkg-config file refers to vulkan-headers.
(substitute* "loader/vulkan.pc.in" (substitute* "loader/vulkan.pc.in"
(("^includedir=.*") (("^includedir=.*")
(string-append "includedir=" vulkan-headers "\n")))))) (string-append "includedir=" vulkan-headers "\n"))))))
(add-after 'unpack 'use-system-googletest (add-after 'unpack 'use-system-googletest
(lambda _ (lambda _
(substitute* "tests/CMakeLists.txt" (substitute* "tests/CMakeLists.txt"
(((string-append "message\\(FATAL_ERROR \"Could not " (((string-append
"find googletest directory. See BUILD.md\"\\)")) "message\\(FATAL_ERROR \"Could not "
"find_package(GTest REQUIRED)")) "find googletest directory. See BUILD.md\"\\)"))
;; Use the namespaced variable. "find_package(GTest REQUIRED)"))
(substitute* "tests/framework/CMakeLists.txt" ;; Use the namespaced variable.
(("PUBLIC gtest ") (substitute* "tests/framework/CMakeLists.txt"
"PUBLIC GTest::gtest "))))))) (("PUBLIC gtest ")
"PUBLIC GTest::gtest ")))))))
(native-inputs (native-inputs
(list googletest (list googletest
libxrandr libxrandr