diff options
Diffstat (limited to 'gnu/packages/vulkan.scm')
| -rw-r--r-- | gnu/packages/vulkan.scm | 41 |
1 files changed, 36 insertions, 5 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1b69da1a4d..dd5b51c7fe 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -299,7 +299,8 @@ Enhanced Subpixel Morphological Anti-Aliasing (license (list license:bsd-3 ; src/reshade/LICENSE.md license:zlib)))) ; LICENSE -(define-public vulkan-headers +;; vulkan-headers, but without the path to vulkan-loader patched in. +(define-public vulkan-headers/no-loader (package (name "vulkan-headers") (version "1.3.280.0") @@ -316,6 +317,7 @@ Enhanced Subpixel Morphological Anti-Aliasing (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. + (properties '((hidden? . #t))) (home-page "https://github.com/KhronosGroup/Vulkan-Headers") (synopsis "Vulkan Header files and API registry") @@ -323,6 +325,25 @@ Enhanced Subpixel Morphological Anti-Aliasing "Vulkan-Headers contains header files and API registry for Vulkan.") (license (list license:asl2.0)))) ;LICENSE.txt +(define-public vulkan-headers + (package + (inherit vulkan-headers/no-loader) + (arguments + (substitute-keyword-arguments (package-arguments vulkan-headers/no-loader) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'patch-libvulkan-file-name + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "include/vulkan/vulkan.hpp" + (("dlopen\\( \"libvulkan.so") + (string-append "dlopen(\"" + (search-input-file + inputs "/lib/libvulkan.so")))))))))) + (inputs + (modify-inputs (package-inputs vulkan-headers/no-loader) + (prepend vulkan-loader))) + (properties '()))) + (define-public vulkan-loader (package (name "vulkan-loader") @@ -383,7 +404,7 @@ Enhanced Subpixel Morphological Anti-Aliasing python wayland)) (inputs - (list vulkan-headers libxrandr)) + (list vulkan-headers/no-loader libxrandr)) (native-search-paths (list (search-path-specification (variable "XDG_DATA_DIRS") @@ -633,9 +654,19 @@ use the Vulkan API.") "0x4jhc8n9c4k8svmmcaxxs613xbsav7wam94gacddlm738cwp13v")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;no test - #:configure-flags '("-DVOLK_INSTALL=ON" "-DVOLK_PULL_IN_VULKAN=ON"))) - (inputs (list vulkan-headers)) + (list + #:tests? #f ;no test + #:configure-flags #~(list "-DVOLK_INSTALL=ON" "-DVOLK_PULL_IN_VULKAN=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-loader-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "volk.c" + (("dlopen\\(\"libvulkan.so") + (string-append "dlopen(\"" + (search-input-file + inputs "/lib/libvulkan.so"))))))))) + (inputs (list vulkan-headers vulkan-loader)) (synopsis "Meta loader for Vulkan API") (description "Volk is a meta-loader for Vulkan. It allows you to dynamically load |