diff options
| author | Hilton Chain <hako@ultrarare.space> | 2024-02-24 22:30:27 +0800 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-03-22 21:08:27 -0400 |
| commit | 99f32490490b4d31dd4225e6617166708fb3193c (patch) | |
| tree | 247d74baa0a967a07ff0e1b9041fe232788f0952 | |
| parent | 48d59208fcbf06c8b02164bc6e17a4ed14a4f3a5 (diff) | |
nongnu: game-client: Add steam-container-libs variable.
* nongnu/packages/game-client.scm (steam-container-libs): New variable.
(steam-ld.so.conf,steam-container,heroic-container): Use it.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
| -rw-r--r-- | nongnu/packages/game-client.scm | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm index 03fd21a..6271895 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -218,6 +218,11 @@ implementation with gogdl and Amazon Games using Nile.") ("python" ,python) ; Required for KillingFloor2 and Wreckfest. ("spdlog" ,spdlog))) ; Required for MangoHud. +(define steam-container-libs + (append steam-client-libs + steam-gameruntime-libs + fhs-min-libs)) + (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). @@ -225,13 +230,9 @@ implementation with gogdl and Amazon Games using Nile.") (define steam-ld.so.conf (packages->ld.so.conf - (list (fhs-union `(,@steam-client-libs - ,@steam-gameruntime-libs - ,@fhs-min-libs) + (list (fhs-union steam-container-libs #:name "fhs-union-64") - (fhs-union `(,@steam-client-libs - ,@steam-gameruntime-libs - ,@fhs-min-libs) + (fhs-union steam-container-libs #:name "fhs-union-32" #:system "i686-linux")))) @@ -246,14 +247,10 @@ implementation with gogdl and Amazon Games using Nile.") (ld.so.conf steam-ld.so.conf) (ld.so.cache steam-ld.so.cache) (union64 - (fhs-union `(,@steam-client-libs - ,@steam-gameruntime-libs - ,@fhs-min-libs) + (fhs-union steam-container-libs #:name "fhs-union-64")) (union32 - (fhs-union `(,@steam-client-libs - ,@steam-gameruntime-libs - ,@fhs-min-libs) + (fhs-union steam-container-libs #:name "fhs-union-32" #:system "i686-linux")) (link-files '("share")) @@ -289,15 +286,11 @@ all games will be installed."))) ;; this is easier and works. (union64 (fhs-union `(,@heroic-extra-client-libs - ,@steam-client-libs - ,@steam-gameruntime-libs - ,@fhs-min-libs) + ,@steam-container-libs) #:name "fhs-union-64")) ;; Don't include heroic-client-libs as they are not needed in 32-bit. (union32 - (fhs-union `(,@steam-client-libs - ,@steam-gameruntime-libs - ,@fhs-min-libs) + (fhs-union steam-container-libs #:name "fhs-union-32" #:system "i686-linux")) (link-files '("share")) |