diff options
| author | Hilton Chain <hako@ultrarare.space> | 2024-01-31 22:28:11 +0800 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-03-22 21:08:42 -0400 |
| commit | e54439a3020f3c49c289d6e47ab72b346bc7ef30 (patch) | |
| tree | 038a5c2265396744aded38bf0923cbe0ca470e07 /nonguix | |
| parent | 2d8de496b1209accd52c4d869e2ffda1769dfe99 (diff) | |
multiarch-container: make-internal-script: Add VDPAU paths to LD_LIBRARY_PATH.
* 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>
Diffstat (limited to 'nonguix')
| -rw-r--r-- | nonguix/multiarch-container.scm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index a922877..1cbf405 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -291,7 +291,6 @@ in a sandboxed FHS environment." "^SDL_" "^STEAM_" "^SSL_" ; SSL certificate environment, needed by curl for Heroic. - "^VDPAU_DRIVER_PATH$" ; For VDPAU drivers. "^XAUTHORITY$" ;; Matching all ^XDG_ vars causes issues ;; discussed in 80decf05. @@ -353,11 +352,9 @@ in a sandboxed FHS environment." ;; the "usual" path, probably so they are included in the ;; pressure-vessel container. (setenv "GUIX_LOCPATH" "/usr/lib/locale") - ;; By default VDPAU drivers are searched for in libvdpau's store - ;; path, so set this path to where the drivers will actually be - ;; located in the container. - (setenv "VDPAU_DRIVER_PATH" "/lib64/vdpau") - ;; Likewise, for VA-API drivers. + ;; By default VA-API drivers are searched for in mesa's store path, + ;; so set this path to where the drivers will actually be located in + ;; the container. (setenv "LIBVA_DRIVERS_PATH" "/lib64/dri:/lib/dri") (format #t "\n* Launching ~a in sandbox: ~a.\n\n" #$(package-name (ngc-wrap-package container)) sandbox-home) @@ -571,7 +568,7 @@ application." ;; 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") + (setenv "LD_LIBRARY_PATH" "/lib64:/lib:/lib64/vdpau:/lib/vdpau") ;; Process FHS-specific command line options. (let* ((options (getopt-long (or fhs-args '("")) fhs-option-spec)) |