aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-11-15 13:16:18 +0100
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-04-14 15:10:51 -0400
commit078f33e4206be799adde55eaac9a5b3125fb392d (patch)
tree904a261092a9da0b444e1b77dc1d02a571528b0a /gnu/packages
parentbf3ef805c6dbcb4fffd70b4cc01660970e9c2d65 (diff)
downloadguix-078f33e4206be799adde55eaac9a5b3125fb392d.tar.gz
guix-078f33e4206be799adde55eaac9a5b3125fb392d.zip
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/vulkan.scm19
1 files 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 _