Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-11-25 01:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: steam: Fix to work with newer mangohud.

Browse source 
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.
This commit is contained in:
John Kehayias 2023-10-14 17:09:28 -04:00
parent 35f6a5b892
commit 14656d642d
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nonguix/multiarch-container.scm
View file

@ -463,12 +463,14 @@ application."
'("/run/current-system/profile/etc" '("/run/current-system/profile/etc"
"/run/current-system/profile/share" "/run/current-system/profile/share"
"/sbin" "/sbin"
"/usr/share/vulkan/icd.d" "/usr/share/vulkan/icd.d"))
"/usr/share/vulkan/implicit_layer.d")) ; Implicit layers like MangoHud
(for-each (for-each
new-symlink new-symlink
`((,ld.so.cache . "/etc/ld.so.cache") `((,ld.so.cache . "/etc/ld.so.cache")
(,ld.so.conf . "/etc/ld.so.conf") ;; needed? (,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") . "/etc/ssl")
((,guix-env "etc/ssl") . "/run/current-system/profile/etc/ssl") ((,guix-env "etc/ssl") . "/run/current-system/profile/etc/ssl")
((,union32 "lib") . "/lib") ((,union32 "lib") . "/lib")
@ -484,13 +486,7 @@ application."
((,union64 "share/fonts") . "/run/current-system/profile/share/fonts") ((,union64 "share/fonts") . "/run/current-system/profile/share/fonts")
((,union64 "etc/fonts") . "/etc/fonts") ((,union64 "etc/fonts") . "/etc/fonts")
((,union64 "share/vulkan/explicit_layer.d") . ((,union64 "share/vulkan/explicit_layer.d") .
"/usr/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")))
(for-each (for-each
icd-symlink icd-symlink
;; Use stat to follow links from packages like MangoHud. ;; Use stat to follow links from packages like MangoHud.