infra/nonguix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
multiarch-container: Place sandbox directory in XDG_DATA_HOME.

See merge request nonguix/nonguix!481
This commit is contained in:
Herman Rimm 2025-02-15 20:56:48 +00:00
commit 2fd26a9fee
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.guix-authorizations
View File

@ -12,6 +12,9 @@
(;; primary: "220F 98D9 5E86 204C 0036 DA7B 6DEC 4360 408B 4185" (;; primary: "220F 98D9 5E86 204C 0036 DA7B 6DEC 4360 408B 4185"
"F4C2 D1DF 3FDE EA63 D1D3 0776 ACC6 6D09 CA52 8292" "F4C2 D1DF 3FDE EA63 D1D3 0776 ACC6 6D09 CA52 8292"
(name "hako")) (name "hako"))
(;; primary: "4519 0024 F2A8 3EE7 0071 D052 AAF8 A093 ECEF A3D1"
"DF0D 4822 21EE 942F E01C 5E55 0DF3 F878 D2F3 C62D"
(name "hermanrimm"))
("5DA3 74E1 EADB DC7C 772D 5E65 5E76 B1AD 0FC2 2F93" ("5DA3 74E1 EADB DC7C 772D 5E65 5E76 B1AD 0FC2 2F93"
(name "ison")) (name "ison"))
(;; primary: "1BA4 08C5 8BF2 0EA7 3179 635A 865D C0A3 DED9 B5D0" (;; primary: "1BA4 08C5 8BF2 0EA7 3179 635A 865D C0A3 DED9 B5D0"

8
nonguix/multiarch-container.scm
View File

@ -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_"