From 078f33e4206be799adde55eaac9a5b3125fb392d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 15 Nov 2022 13:16:18 +0100 Subject: [PATCH] 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 83cd64847fa85df61a31b7cb7f5faeed1dde1f6e..74a06ab4c35daac66533b100633171ac68459bdd 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 _