diff options
| author | Hilton Chain <hako@ultrarare.space> | 2024-01-31 20:31:34 +0800 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-03-22 21:08:31 -0400 |
| commit | 40809109fcef6bc87bf2952394296e73b70e49c9 (patch) | |
| tree | 3592f0496b2b2051379c19459a533503ec122adc /nongnu/packages | |
| parent | 99f32490490b4d31dd4225e6617166708fb3193c (diff) | |
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>
Diffstat (limited to 'nongnu/packages')
| -rw-r--r-- | nongnu/packages/game-client.scm | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm index 6271895..b02b1a8 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -223,6 +223,10 @@ implementation with gogdl and Amazon Games using Nile.") steam-gameruntime-libs fhs-min-libs)) +(define steam-nvidia-container-libs + (modify-inputs steam-container-libs + (replace "mesa" nvda))) + (define heroic-extra-client-libs `(("curl" ,curl) ; Required for Heroic to download e.g. Wine. ("which" ,which) ; Heroic complains about trying to use which (though works). @@ -265,8 +269,13 @@ all games will be installed."))) (name "steam-nvidia") ;; Steam's .desktop files expect a "steam" executable, so provide that. (binary-name "steam") - (union64 (replace-mesa (ngc-union64 steam-container))) - (union32 (replace-mesa (ngc-union32 steam-container))))) + (union64 + (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-nvidia (nonguix-container->package steam-nvidia-container)) @@ -305,8 +314,14 @@ installed."))) (nonguix-container (inherit heroic-container) (name "heroic-nvidia") - (union64 (replace-mesa (ngc-union64 heroic-container))) - (union32 (replace-mesa (ngc-union32 heroic-container))))) + (union64 + (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-nvidia (nonguix-container->package heroic-nvidia-container)) |