This is an automated email from the git hooks/post-receive script.
rekado pushed a commit to branch core-updates
in repository guix.
The following commit(s) were added to refs/heads/core-updates by this push:
new bdff6baca3 gnu: epiphany: Fix dbus startup failure.
bdff6baca3 is described below
commit bdff6baca39a73b3cfc5400e117795cad0c180cf
Author: Ricardo Wurmus <[email protected]>
AuthorDate: Mon Jul 22 11:25:37 2024 +0200
gnu: epiphany: Fix dbus startup failure.
* gnu/packages/gnome.scm (epiphany)[arguments]: Create a union of all
directories in XDG_DATA_DIRS to avoid overwhelming dbus-daemon.
Change-Id: Iac1084832d0fe82c9d41a409a450bd9f2f0f7b93
---
gnu/packages/gnome.scm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0f853875be..3874246bbd 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7225,6 +7225,11 @@ almost all of them.")
(arguments
(list
#:glib-or-gtk? #t
+ #:modules '((guix build meson-build-system)
+ (guix build utils)
+ (guix build union))
+ #:imported-modules `((guix build union)
+ ,@%meson-build-system-modules)
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
@@ -7254,8 +7259,9 @@ almost all of them.")
", ")
"],")))))
(replace 'check
- (lambda* (#:key parallel-tests? tests? #:allow-other-keys)
+ (lambda* (#:key inputs parallel-tests? tests? #:allow-other-keys)
(when tests?
+ ;(setenv "GALLIUM_DRIVER" "llvmpipe")
(setenv "XDG_RUNTIME_DIR" (string-append (getcwd)
"/runtime-dir"))
(mkdir (getenv "XDG_RUNTIME_DIR"))
@@ -7265,6 +7271,13 @@ almost all of them.")
(number->string (parallel-job-count))
"1"))
(setenv "XDG_CACHE_HOME" (getcwd))
+ ;; There are too many directories in XDG_DATA_DIRS, so
+ ;; dbus-daemon fails to start. We work around this by
+ ;; creating a single union directory of all these directories.
+ (setenv "XDG_DATA_DIRS" "/tmp/share")
+ (union-build "/tmp/share"
+ (search-path-as-list '("share") (map cdr inputs))
+ #:create-all-directories? #t)
;; Tests require a running X server.
(system "Xvfb :1 &")
(setenv "DISPLAY" ":1")
