diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2024-07-22 11:25:37 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:45:43 +0200 |
| commit | 4f13ad4aa4073e516fb6cffc466e326ff72aa2df (patch) | |
| tree | 228f75dfa44a4090b9688c3d634d71b896db40b1 | |
| parent | e885edc0df3f99438f6e9e921e95c6bd49194fa0 (diff) | |
| download | guix-4f13ad4aa4073e516fb6cffc466e326ff72aa2df.tar.gz guix-4f13ad4aa4073e516fb6cffc466e326ff72aa2df.zip | |
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
| -rw-r--r-- | gnu/packages/gnome.scm | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index af46d352ee..d8408cd80d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7226,6 +7226,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 @@ -7255,8 +7260,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")) @@ -7266,6 +7272,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") |