Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-11-25 01:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nonguix: multiarch-container: Set LD_LIBRARY_PATH inside container.

Browse source 
Fixes #303.

Previously LD_LIBRARY_PATH was being set before the container was launched,
which could cause issues on some foreign distros where this alters what is
loaded from an FHS structure.  This was only meant to be set inside the
container, though this didn't cause any issues on a Guix System.

* nonguix/multiarch-container.scm (make-container-wrapper): Move setting
LD_LIBRARY_PATH from here ...
(make-internal-script): ... to here.
This commit is contained in:
John Kehayias 2024-01-06 17:01:18 -05:00
parent 7dd68696a2
commit 1f91ecd3c0
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nonguix/multiarch-container.scm
View file

@ -338,10 +338,6 @@ in a sandboxed FHS environment."
(args (cdr (command-line))) (args (cdr (command-line)))
(command (if DEBUG '() (command (if DEBUG '()
`("--" ,run ,@args)))) `("--" ,run ,@args))))
;; Set this so that e.g. non-Steam games added to Steam will launch
;; properly. It seems otherwise they don't make it to launching
;; Steam's pressure-vessel container (for Proton games).
(setenv "LD_LIBRARY_PATH" "/lib64:/lib")
;; Set this so Steam's pressure-vessel container does not need to ;; Set this so Steam's pressure-vessel container does not need to
;; generate locales, improving startup time. This needs to be set to ;; generate locales, improving startup time. This needs to be set to
;; the "usual" path, probably so they are included in the ;; the "usual" path, probably so they are included in the
@ -526,6 +522,16 @@ application."
;; (previous would output this error but continue). ;; (previous would output this error but continue).
(if (file-exists? ".steam/root/bootstrap.tar.xz") (if (file-exists? ".steam/root/bootstrap.tar.xz")
(chmod ".steam/root/bootstrap.tar.xz" #o644)) (chmod ".steam/root/bootstrap.tar.xz" #o644))
;; TODO: Should other environment setup also happen inside the
;; container rather than before container is launched?
;;
;; Set this so that e.g. non-Steam games added to Steam will
;; launch properly. It seems otherwise they don't make it to
;; launching Steam's pressure-vessel container (for Proton
;; games). Wait to set this inside the container to not cause
;; issues on foreign distros, see
;; <https://gitlab.com/nonguix/nonguix/-/issues/303>
(setenv "LD_LIBRARY_PATH" "/lib64:/lib")
;; Process FHS-specific command line options. ;; Process FHS-specific command line options.
(let* ((options (getopt-long (or fhs-args '("")) fhs-option-spec)) (let* ((options (getopt-long (or fhs-args '("")) fhs-option-spec))