From 1c419ee1a8c6b566cb65115ab3e5f42e6b4d7279 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 31 Jan 2024 21:10:19 +0800 Subject: nonguix: multiarch-container: Symlink all available Vulkan layers. * nonguix/multiarch-container.scm (make-internal-script): Symlink all available Vulkan layers. Signed-off-by: John Kehayias --- nonguix/multiarch-container.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'nonguix') diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index 7fda929..31ac943 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -494,14 +494,11 @@ application." "/run/current-system/profile/share" "/sbin" "/usr/lib" - "/usr/share/vulkan/icd.d")) + "/usr/share")) (for-each new-symlink `((,ld.so.cache . "/etc/ld.so.cache") (,ld.so.conf . "/etc/ld.so.conf") ;; needed? - ;; For MangoHud implicit layers. - ((,guix-env "share/vulkan/implicit_layer.d") . - "/usr/share/vulkan/implicit_layer.d") ((,guix-env "etc/ssl") . "/etc/ssl") ((,guix-env "etc/ssl") . "/run/current-system/profile/etc/ssl") ((,union32 "lib") . "/lib") @@ -519,15 +516,27 @@ application." ((,union64 "share/glib-2.0") . "/usr/share/glib-2.0") ; Heroic interface. ((,union64 "share/drirc.d") . "/usr/share/drirc.d") ((,union64 "share/fonts") . "/run/current-system/profile/share/fonts") - ((,union64 "etc/fonts") . "/etc/fonts") - ((,union64 "share/vulkan/explicit_layer.d") . - "/usr/share/vulkan/explicit_layer.d"))) + ((,union64 "etc/fonts") . "/etc/fonts"))) (for-each (cut file-symlink <> "/usr/share/vulkan/icd.d") (append-map get-files `((,union32 "share/vulkan/icd.d") (,union64 "share/vulkan/icd.d")))) + (for-each + (cut file-symlink <> "/usr/share/vulkan/explicit_layer.d") + (append-map + get-files + `((,union64 "share/vulkan/explicit_layer.d") + (,union32 "share/vulkan/explicit_layer.d")))) + (for-each + (cut file-symlink <> "/usr/share/vulkan/implicit_layer.d") + (append-map + get-files + `((,union32 "share/vulkan/implicit_layer.d") + (,union64 "share/vulkan/implicit_layer.d") + ;; For MangoHud implicit layers. + (,guix-env "share/vulkan/implicit_layer.d")))) ;; TODO: This is not the right place for this. ;; Newer versions of Steam won't startup if they can't copy to here ;; (previous would output this error but continue). -- cgit v1.2.3