nonguix: multiarch-container: Expose share/applications and share/drirc.d files from guix environment.

* nonguix/multiarch-container.scm (make-container-wrapper):
(make-internal-script): Link directories from the guix profile. It could be
that a package ships its own configuration for drirc and desktop files. Expose
drirc.d files if a package ships it's own configuration as well.
This commit is contained in:
Alexey Abramov 2023-09-06 11:10:55 +02:00
parent 31f2146716
commit 166686c012
No known key found for this signature in database
GPG Key ID: 352F2B76A8D9E361

View File

@ -286,6 +286,8 @@ in a sandboxed FHS environment."
;; discussed in 80decf05. ;; discussed in 80decf05.
"^XDG_CURRENT_DESKTOP$" "^XDG_CURRENT_DESKTOP$"
"^XDG_DATA_HOME$" "^XDG_DATA_HOME$"
;; In case a package ships desktop files.
"^XDG_DATA_DIRS$"
"^XDG_RUNTIME_DIR$" "^XDG_RUNTIME_DIR$"
"^XDG_SESSION_(CLASS|TYPE)$" "^XDG_SESSION_(CLASS|TYPE)$"
"^(WAYLAND_)?DISPLAY$" "^(WAYLAND_)?DISPLAY$"
@ -497,6 +499,9 @@ application."
(,ld.so.conf . "/etc/ld.so.conf") ;; needed? (,ld.so.conf . "/etc/ld.so.conf") ;; needed?
((,guix-env "etc/ssl") . "/etc/ssl") ((,guix-env "etc/ssl") . "/etc/ssl")
((,guix-env "etc/ssl") . "/run/current-system/profile/etc/ssl") ((,guix-env "etc/ssl") . "/run/current-system/profile/etc/ssl")
((,guix-env "share/applications") . "/run/current-system/profile/share/applications")
((,guix-env "share/applications") . "/usr/share/applications")
((,guix-env "share/drirc.d") . "/usr/share/drirc.d")
((,union32 "lib") . "/lib") ((,union32 "lib") . "/lib")
((,union32 "lib") . "/run/current-system/profile/lib") ((,union32 "lib") . "/run/current-system/profile/lib")
((,union64 "bin") . "/bin") ((,union64 "bin") . "/bin")