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

nonguix: multiarch-container: Share Wayland environment.

Browse source 
* nonguix/multiarch-container.scm (make-container-wrapper): Preserve environment
variables and share socket for Wayland.

Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
This commit is contained in:
Hilton Chain 2024-01-31 21:40:23 +08:00 committed by John Kehayias
parent 8c08d0bbe5
commit 09151acd73
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nonguix/multiarch-container.scm
View file

@ -260,8 +260,9 @@ in a sandboxed FHS environment."
(home (getenv "HOME")) (home (getenv "HOME"))
(sandbox-home (or (getenv "GUIX_SANDBOX_HOME") (sandbox-home (or (getenv "GUIX_SANDBOX_HOME")
(string-append home "/" #$(ngc-sandbox-home container)))) (string-append home "/" #$(ngc-sandbox-home container))))
(wayland-display (or (getenv "WAYLAND_DISPLAY")
"wayland-0"))
(preserved-env '("^DBUS_" (preserved-env '("^DBUS_"
"^DISPLAY$"
"^DRI_PRIME$" "^DRI_PRIME$"
"^GDK_SCALE$" ; For UI scaling. "^GDK_SCALE$" ; For UI scaling.
"^GUIX_LOCPATH$" ; For pressure-vessel locales. "^GUIX_LOCPATH$" ; For pressure-vessel locales.
@ -293,8 +294,11 @@ in a sandboxed FHS environment."
"^XAUTHORITY$" "^XAUTHORITY$"
;; Matching all ^XDG_ vars causes issues ;; Matching all ^XDG_ vars causes issues
;; discussed in 80decf05. ;; discussed in 80decf05.
"^XDG_CURRENT_DESKTOP$"
"^XDG_DATA_HOME$" "^XDG_DATA_HOME$"
"^XDG_RUNTIME_DIR$" "^XDG_RUNTIME_DIR$"
"^XDG_SESSION_(CLASS|TYPE)$"
"^(WAYLAND_)?DISPLAY$"
#$@(ngc-preserved-env container) ; Environment from container. #$@(ngc-preserved-env container) ; Environment from container.
;; The following are useful for debugging. ;; The following are useful for debugging.
"^CAPSULE_DEBUG$" "^CAPSULE_DEBUG$"
@ -333,6 +337,7 @@ in a sandboxed FHS environment."
,@(exists-> (string-append home "/.config/pulse")) ,@(exists-> (string-append home "/.config/pulse"))
,@(exists-> (string-append xdg-runtime "/pulse")) ,@(exists-> (string-append xdg-runtime "/pulse"))
,@(exists-> (string-append xdg-runtime "/bus")) ,@(exists-> (string-append xdg-runtime "/bus"))
,@(exists-> (string-append xdg-runtime "/" wayland-display))
,@(exists-> (getenv "XAUTHORITY")) ,@(exists-> (getenv "XAUTHORITY"))
#$@(ngc-shared container))) #$@(ngc-shared container)))
(DEBUG (equal? (getenv "DEBUG") "1")) (DEBUG (equal? (getenv "DEBUG") "1"))