[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/416: gnu: vulkan-validationlayers: Avoid direct variable references.
From: |
guix-commits |
Subject: |
08/416: gnu: vulkan-validationlayers: Avoid direct variable references. |
Date: |
Fri, 14 Apr 2023 15:25:11 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 078f33e4206be799adde55eaac9a5b3125fb392d
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Nov 15 13:16:18 2022 +0100
gnu: vulkan-validationlayers: Avoid direct variable references.
* gnu/packages/vulkan.scm (vulkan-validationlayers)[arguments]: Refer to
GLSLANG and SPIRV-HEADERS from inputs, instead of the global variables.
---
gnu/packages/vulkan.scm | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 83cd64847f..74a06ab4c3 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -417,12 +417,19 @@ shader compilation.")
(native-inputs (list pkg-config python spirv-headers vulkan-headers))
(arguments
(list #:tests? #f ;no tests
- #:configure-flags #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF"
- (string-append "-DGLSLANG_INSTALL_DIR="
- #$glslang)
- (string-append
- "-DSPIRV_HEADERS_INSTALL_DIR="
- #$spirv-headers) "-Wno-dev")
+ #:configure-flags
+ #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF"
+ (string-append "-DGLSLANG_INSTALL_DIR="
+ (dirname (dirname
+ (search-input-directory
+ %build-inputs
+ "include/glslang"))))
+ (string-append "-DSPIRV_HEADERS_INSTALL_DIR="
+ (dirname (dirname
+ (search-input-directory
+ %build-inputs
+ "include/spirv"))))
+ "-Wno-dev")
#:phases #~(modify-phases %standard-phases
(add-after 'install 'set-layer-path-in-manifest
(lambda _
- branch master updated (cbba52aaf7 -> 4bbd0f8c7a), guix-commits, 2023/04/14
- 02/416: gnu: spirv-tools: Update to 2021.4., guix-commits, 2023/04/14
- 01/416: gnu: spirv-headers: Update to 1.2.198.0., guix-commits, 2023/04/14
- 03/416: gnu: vulkan-headers: Update to 1.2.202., guix-commits, 2023/04/14
- 06/416: gnu: shaderc: Update to 2021.3., guix-commits, 2023/04/14
- 07/416: gnu: Add vulkan-validationlayers., guix-commits, 2023/04/14
- 16/416: gnu: python-pytest-timeout: Update to 2.1.0., guix-commits, 2023/04/14
- 21/416: gnu: sbcl: Resolve TODO., guix-commits, 2023/04/14
- 04/416: gnu: vulkan-loader: Update to 1.2.202., guix-commits, 2023/04/14
- 05/416: gnu: vulkan-tools: Update to 1.2.201., guix-commits, 2023/04/14
- 08/416: gnu: vulkan-validationlayers: Avoid direct variable references.,
guix-commits <=
- 10/416: gnu: spirv-headers: Update to 1.3.231.1., guix-commits, 2023/04/14
- 09/416: gnu: spirv-tools: Disable building static libraries., guix-commits, 2023/04/14
- 11/416: gnu: spirv-tools: Update to 2022.4., guix-commits, 2023/04/14
- 12/416: gnu: glslang: Update to 11.9.0., guix-commits, 2023/04/14
- 13/416: gnu: libaom: Update to 3.5.0., guix-commits, 2023/04/14
- 17/416: gnu: xdg-utils: Resolve TODOs., guix-commits, 2023/04/14
- 18/416: gnu: xdg-utils: Use G-expression., guix-commits, 2023/04/14
- 14/416: gnu: VLC: Fix build with dav1d 1.0., guix-commits, 2023/04/14
- 22/416: gnu: spirv-headers: Replace version with %vulkan-sdk-version., guix-commits, 2023/04/14
- 23/416: gnu: spirv-tools: Replace version with %vulkan-sdk-version., guix-commits, 2023/04/14