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

multiarch-container: make-internal-script: Add VDPAU paths to LD_LIBRARY_PATH.

Browse source 
* nonguix/multiarch-container.scm (make-container-wrapper): Don't set
VDPAU_DRIVER_PATH.
(make-internal-script): Add VDPAU paths to LD_LIBRARY_PATH.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
This commit is contained in:
Hilton Chain 2024-01-31 22:28:11 +08:00 committed by John Kehayias
parent 2d8de496b1
commit e54439a302
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nonguix/multiarch-container.scm
View file

@ -291,7 +291,6 @@ in a sandboxed FHS environment."
"^SDL_" "^SDL_"
"^STEAM_" "^STEAM_"
"^SSL_" ; SSL certificate environment, needed by curl for Heroic. "^SSL_" ; SSL certificate environment, needed by curl for Heroic.
"^VDPAU_DRIVER_PATH$" ; For VDPAU drivers.
"^XAUTHORITY$" "^XAUTHORITY$"
;; Matching all ^XDG_ vars causes issues ;; Matching all ^XDG_ vars causes issues
;; discussed in 80decf05. ;; discussed in 80decf05.
@ -353,11 +352,9 @@ in a sandboxed FHS environment."
;; the "usual" path, probably so they are included in the ;; the "usual" path, probably so they are included in the
;; pressure-vessel container. ;; pressure-vessel container.
(setenv "GUIX_LOCPATH" "/usr/lib/locale") (setenv "GUIX_LOCPATH" "/usr/lib/locale")
;; By default VDPAU drivers are searched for in libvdpau's store ;; By default VA-API drivers are searched for in mesa's store path,
;; path, so set this path to where the drivers will actually be ;; so set this path to where the drivers will actually be located in
;; located in the container. ;; the container.
(setenv "VDPAU_DRIVER_PATH" "/lib64/vdpau")
;; Likewise, for VA-API drivers.
(setenv "LIBVA_DRIVERS_PATH" "/lib64/dri:/lib/dri") (setenv "LIBVA_DRIVERS_PATH" "/lib64/dri:/lib/dri")
(format #t "\n* Launching ~a in sandbox: ~a.\n\n" (format #t "\n* Launching ~a in sandbox: ~a.\n\n"
#$(package-name (ngc-wrap-package container)) sandbox-home) #$(package-name (ngc-wrap-package container)) sandbox-home)
@ -571,7 +568,7 @@ application."
;; games). Wait to set this inside the container to not cause ;; games). Wait to set this inside the container to not cause
;; issues on foreign distros, see ;; issues on foreign distros, see
;; <https://gitlab.com/nonguix/nonguix/-/issues/303> ;; <https://gitlab.com/nonguix/nonguix/-/issues/303>
(setenv "LD_LIBRARY_PATH" "/lib64:/lib") (setenv "LD_LIBRARY_PATH" "/lib64:/lib:/lib64/vdpau:/lib/vdpau")
;; 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))