diff options
| author | Herman Rimm <herman@rimm.ee> | 2024-06-17 11:19:29 +0200 |
|---|---|---|
| committer | Hilton Chain <hako@ultrarare.space> | 2025-04-18 15:11:45 +0800 |
| commit | d6fdc8ced46f55bb4459e0304bf50b0c6e713ade (patch) | |
| tree | d19b5ad1e4a923bbd63b4f8a29bce53f3f6d7e91 | |
| parent | 6f4d87c43a1c2cf992aa60d5b204e887f4cfbf01 (diff) | |
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>
| -rw-r--r-- | nonguix/multiarch-container.scm | 5 |
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_" |