From 166686c012fb6bf2b1a57534595f84f809f4d1e5 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Wed, 6 Sep 2023 11:10:55 +0200 Subject: [PATCH] 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. --- nonguix/multiarch-container.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index a946eca..5f84b18 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -286,6 +286,8 @@ in a sandboxed FHS environment." ;; discussed in 80decf05. "^XDG_CURRENT_DESKTOP$" "^XDG_DATA_HOME$" + ;; In case a package ships desktop files. + "^XDG_DATA_DIRS$" "^XDG_RUNTIME_DIR$" "^XDG_SESSION_(CLASS|TYPE)$" "^(WAYLAND_)?DISPLAY$" @@ -497,6 +499,9 @@ application." (,ld.so.conf . "/etc/ld.so.conf") ;; needed? ((,guix-env "etc/ssl") . "/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") . "/run/current-system/profile/lib") ((,union64 "bin") . "/bin")