nongnu: game-client: Replace mesa with nvda in NVIDIA containers.

* nongnu/packages/game-client.scm (steam-nvidia-container-libs): New variable.
(steam-nvidia-container,heroic-nvidia-container): Use it.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
This commit is contained in:
Hilton Chain 2024-01-31 20:31:34 +08:00 committed by John Kehayias
parent 99f3249049
commit 40809109fc
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9

View file

@ -223,6 +223,10 @@ implementation with gogdl and Amazon Games using Nile.")
steam-gameruntime-libs steam-gameruntime-libs
fhs-min-libs)) fhs-min-libs))
(define steam-nvidia-container-libs
(modify-inputs steam-container-libs
(replace "mesa" nvda)))
(define heroic-extra-client-libs (define heroic-extra-client-libs
`(("curl" ,curl) ; Required for Heroic to download e.g. Wine. `(("curl" ,curl) ; Required for Heroic to download e.g. Wine.
("which" ,which) ; Heroic complains about trying to use which (though works). ("which" ,which) ; Heroic complains about trying to use which (though works).
@ -265,8 +269,13 @@ all games will be installed.")))
(name "steam-nvidia") (name "steam-nvidia")
;; Steam's .desktop files expect a "steam" executable, so provide that. ;; Steam's .desktop files expect a "steam" executable, so provide that.
(binary-name "steam") (binary-name "steam")
(union64 (replace-mesa (ngc-union64 steam-container))) (union64
(union32 (replace-mesa (ngc-union32 steam-container))))) (fhs-union steam-nvidia-container-libs
#:name "fhs-union-64"))
(union32
(fhs-union steam-nvidia-container-libs
#:name "fhs-union-32"
#:system "i686-linux"))))
(define-public steam (nonguix-container->package steam-container)) (define-public steam (nonguix-container->package steam-container))
(define-public steam-nvidia (nonguix-container->package steam-nvidia-container)) (define-public steam-nvidia (nonguix-container->package steam-nvidia-container))
@ -305,8 +314,14 @@ installed.")))
(nonguix-container (nonguix-container
(inherit heroic-container) (inherit heroic-container)
(name "heroic-nvidia") (name "heroic-nvidia")
(union64 (replace-mesa (ngc-union64 heroic-container))) (union64
(union32 (replace-mesa (ngc-union32 heroic-container))))) (fhs-union `(,@heroic-extra-client-libs
,@steam-nvidia-container-libs)
#:name "fhs-union-64"))
(union32
(fhs-union steam-nvidia-container-libs
#:name "fhs-union-32"
#:system "i686-linux"))))
(define-public heroic (nonguix-container->package heroic-container)) (define-public heroic (nonguix-container->package heroic-container))
(define-public heroic-nvidia (nonguix-container->package heroic-nvidia-container)) (define-public heroic-nvidia (nonguix-container->package heroic-nvidia-container))