From 14656d642dc113c73f9b144ccba366376a274a2b Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sat, 14 Oct 2023 17:09:28 -0400 Subject: nongnu: steam: Fix to work with newer mangohud. In 0.7.0 of MangoHud the vulkan implicit layers have different names for 32- and 64-bit so we no longer need a workaround. * nonguix/multiarch-container.scm (make-internal-script): No longer create /usr/share/vulkan/implicit_layer.d. Symlink instead directly from guix-env. Remove vulkan layer renaming from mangohud. --- nonguix/multiarch-container.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'nonguix/multiarch-container.scm') diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index 1a61346..6bb1916 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -463,12 +463,14 @@ application." '("/run/current-system/profile/etc" "/run/current-system/profile/share" "/sbin" - "/usr/share/vulkan/icd.d" - "/usr/share/vulkan/implicit_layer.d")) ; Implicit layers like MangoHud + "/usr/share/vulkan/icd.d")) (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") @@ -484,13 +486,7 @@ application." ((,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") - ;; The MangoHud layer has the same file name for 64- and 32-bit, - ;; so create links with different names. - ((,union64 "share/vulkan/implicit_layer.d/MangoHud.json") . - "/usr/share/vulkan/implicit_layer.d/MangoHud.json") - ((,union32 "share/vulkan/implicit_layer.d/MangoHud.json") . - "/usr/share/vulkan/implicit_layer.d/MangoHud.x86.json"))) + "/usr/share/vulkan/explicit_layer.d"))) (for-each icd-symlink ;; Use stat to follow links from packages like MangoHud. -- cgit v1.2.3