multiarch-container: Support sandbox home relative to XDG_DATA_HOME.

* nonguix/multiarch-container.scm (make-container-wrapper): Set sandbox-home
relative to XDG_DATA_HOME environment variable, if it exists.

Signed-off-by: Hilton Chain <hako@ultrarare.space>
Modified-by: Hilton Chain <hako@ultrarare.space>

1 files changed, 4 insertions, 1 deletions

diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm
index 8567542..77dee97 100644
--- a/nonguix/multiarch-container.scm
+++ b/nonguix/multiarch-container.scm
@@ -269,10 +269,13 @@ in a sandboxed FHS environment."
                `(,file) '()))
          (let* ((run #$(file-append fhs-internal "/bin/" (ngc-internal-name container)))
                 (manifest-file #$(file-append fhs-manifest))
+                (xdg-data-home (getenv "XDG_DATA_HOME"))
                 (xdg-runtime (getenv "XDG_RUNTIME_DIR"))
                 (home (getenv "HOME"))
                 (sandbox-home (or (getenv "GUIX_SANDBOX_HOME")
-                                  (string-append home "/" #$(ngc-sandbox-home container))))
+                                  (if xdg-data-home
+                                      (in-vicinity xdg-data-home "guix-sandbox-home")
+                                      (in-vicinity home #$(ngc-sandbox-home container)))))
                 (wayland-display (or (getenv "WAYLAND_DISPLAY")
                                      "wayland-0"))
                 (preserved-env '("^DBUS_"