[bug#39422] [PATCH] gnu: Add pasystray.

[bug#39422] [PATCH] gnu: Add pasystray.

[Amin Bandali]

* gnu/packages/gtk.scm (pasystray): New variable.
---
 gnu/packages/gtk.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f934eabe27..0dc83cf473 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
 ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2020 Amin Bandali <mab@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -53,6 +54,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages avahi)
   #:use-module (gnu packages base)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages check)
@@ -75,6 +77,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pretty-print)
+  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages guile)
@@ -1892,3 +1895,41 @@ displayed on the other side of the bus.")
 
     ;; Dual-licensed under either LGPLv2.1 or LGPLv3.
     (license (list license:lgpl2.1 license:lgpl3))))
+
+(define-public pasystray
+  (package
+    (name "pasystray")
+    (version "0.7.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/christophgysin/pasystray.git")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'bootstrap 'remove-bootstrap.sh
+           (lambda _
+             (delete-file "bootstrap.sh") ; not useful in the context of Guix
+             #t)))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)           ; for aclocal
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("pulseaudio" ,pulseaudio)
+       ("avahi" ,avahi)
+       ("gtk+" ,gtk+)
+       ("libx11" ,libx11)
+       ("libnotify" ,libnotify)))
+    (home-page "https://github.com/christophgysin/pasystray")
+    (synopsis "PulseAudio controller for the system tray")
+    (description "@command{pasystray} enables control of various
+PulseAudio server settings from the X11 system tray.  See the project
+README.md for a detailed list of features.")
+    (license license:lgpl2.1+)))
-- 
2.25.0

[bug#39422] [PATCH] gnu: Add pasystray.

[Leo Famulari]

On Tue, Feb 04, 2020 at 10:31:23AM -0500, Amin Bandali wrote:
> * gnu/packages/gtk.scm (pasystray): New variable.

Thanks! Can we put it in the pulseaudio module?

> +         (add-before 'bootstrap 'remove-bootstrap.sh
> +           (lambda _
> +             (delete-file "bootstrap.sh") ; not useful in the context of Guix
> +             #t)))))

Also, can you clarify this comment? Like, does it interfere with
building?

[bug#39422] [PATCH] gnu: Add pasystray.

[Amin Bandali]

[-- Attachment #1.1: Type: text/plain, Size: 1471 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Tue, Feb 04, 2020 at 10:31:23AM -0500, Amin Bandali wrote:
>> * gnu/packages/gtk.scm (pasystray): New variable.
>
> Thanks! Can we put it in the pulseaudio module?
>

Sure!  Noting that now there's a circular import between the pulseaudio
module and the gnome module because of dependency of pasystray on
libnotify, defined in the gnome module.

>
>> +         (add-before 'bootstrap 'remove-bootstrap.sh
>> +           (lambda _
>> +             (delete-file "bootstrap.sh") ; not useful in the context of Guix
>> +             #t)))))
>
> Also, can you clarify this comment? Like, does it interfere with
> building?
>

Yeah, exactly:

--8<---------------cut here---------------start------------->8---
...
starting phase `bootstrap'
running './bootstrap.sh'
patch-shebang: ./bootstrap.sh: changing `/usr/bin/env bash' to `/gnu/store/29jhbbg1hf557x8j53f9sxd9imlmf02a-bash-minimal-5.0.7/bin/bash'
configure.ac:27: installing './compile'
configure.ac:26: installing './install-sh'
configure.ac:26: installing './missing'
src/Makefile.am: installing './depcomp'
./bootstrap.sh: ./configure: /bin/sh: bad interpreter: No such file or directory
command "./bootstrap.sh" failed with status 126
--8<---------------cut here---------------end--------------->8---

PATCH v2 below mentions that bootstrap.sh interferes with build.
Is that better?  Or were you thinking of a longer explanation?

                                 * * *


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-pasystray.patch --]
[-- Type: text/x-patch, Size: 2611 bytes --]

From 025f5eea0fb0508d0306d3c476b3c47c4fc9273c Mon Sep 17 00:00:00 2001
From: Amin Bandali <mab@gnu.org>
Date: Tue, 4 Feb 2020 20:31:49 -0500
Subject: [PATCH v2] gnu: Add pasystray.

* gnu/packages/pulseaudio.scm (pasystray): New variable.
---
 gnu/packages/pulseaudio.scm | 40 +++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index 2bbe6c5bdd..0e37fe4f48 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -42,6 +42,7 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages dbm)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)     ; for libnotify
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages web)
@@ -402,3 +403,42 @@ install one or more of the following packages alongside pulseaudio-dlna:
      "pamixer is like amixer but for PulseAudio, allowing easy control of the
 volume levels of the sinks (get, set, decrease, increase, toggle mute, etc).")
     (license l:gpl3+)))
+
+(define-public pasystray
+  (package
+    (name "pasystray")
+    (version "0.7.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/christophgysin/pasystray.git")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'bootstrap 'remove-bootstrap.sh
+           (lambda _
+             (delete-file "bootstrap.sh") ; not useful in the context of Guix,
+                                          ; and interferes with build
+             #t)))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)           ; for aclocal
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("avahi" ,avahi)
+       ("gtk+" ,gtk+)
+       ("libnotify" ,libnotify)
+       ("libx11" ,libx11)
+       ("pulseaudio" ,pulseaudio)))
+    (home-page "https://github.com/christophgysin/pasystray")
+    (synopsis "PulseAudio controller for the system tray")
+    (description "@command{pasystray} enables control of various
+PulseAudio server settings from the X11 system tray.  See the project
+README.md for a detailed list of features.")
+    (license l:lgpl2.1+)))
-- 
2.25.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#39422: [PATCH] gnu: Add pasystray.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

On Tue, Feb 04, 2020 at 08:36:05PM -0500, Amin Bandali wrote:
> From 025f5eea0fb0508d0306d3c476b3c47c4fc9273c Mon Sep 17 00:00:00 2001
> From: Amin Bandali <mab@gnu.org>
> Date: Tue, 4 Feb 2020 20:31:49 -0500
> Subject: [PATCH v2] gnu: Add pasystray.
> 
> * gnu/packages/pulseaudio.scm (pasystray): New variable.

Thanks! Pushed as d9e2f7b284f124b48b9fee150a3c06b5e0170049

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]