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>
This commit is contained in:
parent
48d59208fc
commit
99f3249049
|
@ -218,6 +218,11 @@ implementation with gogdl and Amazon Games using Nile.")
|
||||||
("python" ,python) ; Required for KillingFloor2 and Wreckfest.
|
("python" ,python) ; Required for KillingFloor2 and Wreckfest.
|
||||||
("spdlog" ,spdlog))) ; Required for MangoHud.
|
("spdlog" ,spdlog))) ; Required for MangoHud.
|
||||||
|
|
||||||
|
(define steam-container-libs
|
||||||
|
(append steam-client-libs
|
||||||
|
steam-gameruntime-libs
|
||||||
|
fhs-min-libs))
|
||||||
|
|
||||||
(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).
|
||||||
|
@ -225,13 +230,9 @@ implementation with gogdl and Amazon Games using Nile.")
|
||||||
|
|
||||||
(define steam-ld.so.conf
|
(define steam-ld.so.conf
|
||||||
(packages->ld.so.conf
|
(packages->ld.so.conf
|
||||||
(list (fhs-union `(,@steam-client-libs
|
(list (fhs-union steam-container-libs
|
||||||
,@steam-gameruntime-libs
|
|
||||||
,@fhs-min-libs)
|
|
||||||
#:name "fhs-union-64")
|
#:name "fhs-union-64")
|
||||||
(fhs-union `(,@steam-client-libs
|
(fhs-union steam-container-libs
|
||||||
,@steam-gameruntime-libs
|
|
||||||
,@fhs-min-libs)
|
|
||||||
#:name "fhs-union-32"
|
#:name "fhs-union-32"
|
||||||
#:system "i686-linux"))))
|
#:system "i686-linux"))))
|
||||||
|
|
||||||
|
@ -246,14 +247,10 @@ implementation with gogdl and Amazon Games using Nile.")
|
||||||
(ld.so.conf steam-ld.so.conf)
|
(ld.so.conf steam-ld.so.conf)
|
||||||
(ld.so.cache steam-ld.so.cache)
|
(ld.so.cache steam-ld.so.cache)
|
||||||
(union64
|
(union64
|
||||||
(fhs-union `(,@steam-client-libs
|
(fhs-union steam-container-libs
|
||||||
,@steam-gameruntime-libs
|
|
||||||
,@fhs-min-libs)
|
|
||||||
#:name "fhs-union-64"))
|
#:name "fhs-union-64"))
|
||||||
(union32
|
(union32
|
||||||
(fhs-union `(,@steam-client-libs
|
(fhs-union steam-container-libs
|
||||||
,@steam-gameruntime-libs
|
|
||||||
,@fhs-min-libs)
|
|
||||||
#:name "fhs-union-32"
|
#:name "fhs-union-32"
|
||||||
#:system "i686-linux"))
|
#:system "i686-linux"))
|
||||||
(link-files '("share"))
|
(link-files '("share"))
|
||||||
|
@ -289,15 +286,11 @@ all games will be installed.")))
|
||||||
;; this is easier and works.
|
;; this is easier and works.
|
||||||
(union64
|
(union64
|
||||||
(fhs-union `(,@heroic-extra-client-libs
|
(fhs-union `(,@heroic-extra-client-libs
|
||||||
,@steam-client-libs
|
,@steam-container-libs)
|
||||||
,@steam-gameruntime-libs
|
|
||||||
,@fhs-min-libs)
|
|
||||||
#:name "fhs-union-64"))
|
#:name "fhs-union-64"))
|
||||||
;; Don't include heroic-client-libs as they are not needed in 32-bit.
|
;; Don't include heroic-client-libs as they are not needed in 32-bit.
|
||||||
(union32
|
(union32
|
||||||
(fhs-union `(,@steam-client-libs
|
(fhs-union steam-container-libs
|
||||||
,@steam-gameruntime-libs
|
|
||||||
,@fhs-min-libs)
|
|
||||||
#:name "fhs-union-32"
|
#:name "fhs-union-32"
|
||||||
#:system "i686-linux"))
|
#:system "i686-linux"))
|
||||||
(link-files '("share"))
|
(link-files '("share"))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user