gnu: pasystray: Fix Wayland segfault.

* gnu/packages/patches/pasystray-check-x11.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/pulseaudio.scm (pasystray)[origin]: Use it.
  [inputs]: Add libappindicator.

Fixes: guix/guix#5204
Merges: guix/guix!9581
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

3 files changed, 33 insertions, 2 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index fc66449d420..279d0d5c6b1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2117,6 +2117,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/pnet-newer-libgc-fix.patch               \
   %D%/packages/patches/pnet-newer-texinfo-fix.patch             \
   %D%/packages/patches/password-store-tree-compat.patch         \
+  %D%/packages/patches/pasystray-check-x11.patch                \
   %D%/packages/patches/pciutils-hurd64.patch                    \
   %D%/packages/patches/pcsxr-find-harfbuzz.patch                        \
   %D%/packages/patches/pcsxr-fix-definitions.patch                      \
diff --git a/gnu/packages/patches/pasystray-check-x11.patch b/gnu/packages/patches/pasystray-check-x11.patch
new file mode 100644
index 00000000000..50f9e08b735
--- /dev/null
+++ b/gnu/packages/patches/pasystray-check-x11.patch
@@ -0,0 +1,29 @@
+This patch should fix the instant segfault behavior observed when running in a
+Wayland environment. The patch is as used in Debian[1], itself derived from
+this[2] finding, according to the same effort made in nixpkgs[3]; This patch
+should be retired once the corresponding pull request[4] is merged.
+
+[1] https://sources.debian.org/data/main/p/pasystray/0.8.1-1/debian/patches/0002-Require-X11-backend.patch
+[2] https://github.com/christophgysin/pasystray/issues/90#issuecomment-636364122
+[3] https://github.com/NixOS/nixpkgs/pull/220365
+[4] https://github.com/christophgysin/pasystray/pull/171
+
+From: Scott Leggett <scott@sl.id.au>
+Date: Mon, 29 Oct 2018 22:40:16 +1100
+Subject: Require X11 backend
+Forwarded: not-needed
+
+---
+ src/pasystray.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/pasystray.c
++++ b/src/pasystray.c
+@@ -38,6 +38,7 @@ static menu_infos_t* mis;
+ 
+ int main(int argc, char *argv[])
+ {
++               gdk_set_allowed_backends ("x11");
+     GOptionEntry* options = get_options();
+     GError *error = NULL;
+     gtk_init_with_args(&argc, &argv, NULL, options, NULL, &error);
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index 20a1dfd5883..34859783e86 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -431,7 +431,8 @@ volume levels of the sinks (get, set, decrease, increase, toggle mute, etc).")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1zf79pfmm7wa1l9yyab2g6lf0j81v1mrp406262rd21g4prx1921"))))
+        (base32 "1zf79pfmm7wa1l9yyab2g6lf0j81v1mrp406262rd21g4prx1921"))
+       (patches (search-patches "pasystray-check-x11.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -444,7 +445,7 @@ volume levels of the sinks (get, set, decrease, increase, toggle mute, etc).")
     (native-inputs
      (list autoconf automake pkg-config))
     (inputs
-     (list avahi gtk+ libnotify libx11 pulseaudio))
+     (list avahi gtk+ libnotify libx11 pulseaudio libappindicator))
     (home-page "https://github.com/christophgysin/pasystray")
     (synopsis "PulseAudio controller for the system tray")
     (description "@command{pasystray} enables control of various