multiarch-container: Place sandbox directory in XDG_DATA_HOME.
* nonguix/multiarch-container.scm (make-container-wrapper): Set sandbox-home relative to XDG_DATA_HOME.
This commit is contained in:
parent
a26ba00665
commit
a76042b479
|
@ -255,10 +255,16 @@ in a sandboxed FHS environment."
|
||||||
`(,file) '()))
|
`(,file) '()))
|
||||||
(let* ((run #$(file-append fhs-internal "/bin/" (ngc-internal-name container)))
|
(let* ((run #$(file-append fhs-internal "/bin/" (ngc-internal-name container)))
|
||||||
(manifest-file #$(file-append fhs-manifest))
|
(manifest-file #$(file-append fhs-manifest))
|
||||||
|
(xdg-data-home (getenv "XDG_DATA_HOME"))
|
||||||
(xdg-runtime (getenv "XDG_RUNTIME_DIR"))
|
(xdg-runtime (getenv "XDG_RUNTIME_DIR"))
|
||||||
(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))))
|
(if xdg-data-home
|
||||||
|
(string-append xdg-data-home
|
||||||
|
"/guix-sandbox-home")
|
||||||
|
(string-append
|
||||||
|
home "/"
|
||||||
|
#$(ngc-sandbox-home container)))))
|
||||||
(wayland-display (or (getenv "WAYLAND_DISPLAY")
|
(wayland-display (or (getenv "WAYLAND_DISPLAY")
|
||||||
"wayland-0"))
|
"wayland-0"))
|
||||||
(preserved-env '("^DBUS_"
|
(preserved-env '("^DBUS_"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user