infra/nonguix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nongnu: steam: generate ld.so.conf later

Browse Source 
This fixes steam-nvidia ld.so.conf
This commit is contained in:
Jean-Baptiste Volatier 2023-01-17 09:51:45 +01:00
parent ceeeb5365d
commit 5e0637cba2
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nongnu/packages/steam-client.scm
View File

@ -304,21 +304,6 @@ in the Guix store"
fhs-lib-dirs))) fhs-lib-dirs)))
#$output))))) #$output)))))
(define steam-ld.so.conf
(packages->ld.so.conf
(list (fhs-union `(,@steam-client-libs
,@steam-gameruntime-libs
,@fhs-min-libs)
#:name "fhs-union-64")
(fhs-union `(,@steam-client-libs
,@steam-gameruntime-libs
,@fhs-min-libs)
#:name "fhs-union-32"
#:system "i686-linux"))))
(define steam-ld.so.cache
(ld.so.conf->ld.so.cache steam-ld.so.conf))
(define (nonguix-container->package container) (define (nonguix-container->package container)
"Return a package with wrapper script to launch the supplied container object "Return a package with wrapper script to launch the supplied container object
in a sandboxed FHS environment." in a sandboxed FHS environment."
@ -561,8 +546,9 @@ application."
;; contains are directly to /gnu/store/. Instead, it could be generated with ;; contains are directly to /gnu/store/. Instead, it could be generated with
;; a generic ld.so.conf and result in paths more typical in an FHS distro, ;; a generic ld.so.conf and result in paths more typical in an FHS distro,
;; like /lib within the container. This may be useful for future compatibility. ;; like /lib within the container. This may be useful for future compatibility.
(let* ((ld.so.conf steam-ld.so.conf) (let* ((ld.so.conf (packages->ld.so.conf (list (ngc-union64 container)
(ld.so.cache steam-ld.so.cache) (ngc-union32 container))))
(ld.so.cache (ld.so.conf->ld.so.cache ld.so.conf))
(pkg (ngc-wrap-package container)) (pkg (ngc-wrap-package container))
(run (ngc-run container))) (run (ngc-run container)))
(program-file (program-file