unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#39522] [PATCH] gnu: dunst: Build dunstify.
@ 2020-02-09  9:11 Brice Waegeneire
  2020-02-09 23:45 ` Nicolas Goaziou
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Brice Waegeneire @ 2020-02-09  9:11 UTC (permalink / raw)
  To: 39522

* gnu/packages/dunst.scm (dunst)[arguments]: Add phase install-dunstify.
[inputs]: Add libnotify.
---
 gnu/packages/dunst.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm
index 75f2b80e5f..ecb6c15e16 100644
--- a/gnu/packages/dunst.scm
+++ b/gnu/packages/dunst.scm
@@ -26,6 +26,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -52,9 +53,15 @@
                           ;; Otherwise it tries to install service file
                           ;; to "dbus" store directory.
                           (string-append "SERVICEDIR_DBUS=" %output
-                                         "/share/dbus-1/services"))
+                                         "/share/dbus-1/services")
+                          "dunstify")
        #:phases (modify-phases %standard-phases
-                  (delete 'configure))))
+                  (delete 'configure)
+                  (add-after 'install 'install-dunstify
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out")))
+                        (copy-file "dunstify"
+                                   (string-append out "/bin/dunstify"))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("perl" ,perl)                   ; for pod2man
@@ -65,6 +72,7 @@
        ("glib" ,glib)
        ("cairo" ,cairo)
        ("pango" ,pango)
+       ("libnotify" ,libnotify)         ; for dunstify
        ("libx11" ,libx11)
        ("libxscrnsaver" ,libxscrnsaver)
        ("libxinerama" ,libxinerama)
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [bug#39522] [PATCH] gnu: dunst: Build dunstify.
  2020-02-09  9:11 [bug#39522] [PATCH] gnu: dunst: Build dunstify Brice Waegeneire
@ 2020-02-09 23:45 ` Nicolas Goaziou
  2020-02-10  8:57   ` Brice Waegeneire
  2020-02-10  8:51 ` [bug#39522] [PATCH v2] " Brice Waegeneire
       [not found] ` <handler.39522.D39522.15814455763176.notifdone@debbugs.gnu.org>
  2 siblings, 1 reply; 6+ messages in thread
From: Nicolas Goaziou @ 2020-02-09 23:45 UTC (permalink / raw)
  To: Brice Waegeneire; +Cc: 39522

Hello,

Brice Waegeneire <brice@waegenei.re> writes:

> * gnu/packages/dunst.scm (dunst)[arguments]: Add phase install-dunstify.
> [inputs]: Add libnotify.

Please add a copyright line for you.

> +                  (add-after 'install 'install-dunstify
> +                    (lambda* (#:key outputs #:allow-other-keys)
> +                      (let ((out (assoc-ref outputs "out")))
> +                        (copy-file "dunstify"
> +                                   (string-append out "/bin/dunstify"))))))))

I suggest to use

  (install-file "dunstify" (string-append out "/bin"))

instead.

Also, the phase must end with #t.

Could you send an updated patch?

Thank you!

Regards,

-- 
Nicolas Goaziou

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#39522] [PATCH v2] gnu: dunst: Build dunstify.
  2020-02-09  9:11 [bug#39522] [PATCH] gnu: dunst: Build dunstify Brice Waegeneire
  2020-02-09 23:45 ` Nicolas Goaziou
@ 2020-02-10  8:51 ` Brice Waegeneire
       [not found] ` <handler.39522.D39522.15814455763176.notifdone@debbugs.gnu.org>
  2 siblings, 0 replies; 6+ messages in thread
From: Brice Waegeneire @ 2020-02-10  8:51 UTC (permalink / raw)
  To: 39522

* gnu/packages/dunst.scm (dunst)[arguments]: Add phase install-dunstify.
[inputs]: Add libnotify.
---
 gnu/packages/dunst.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm
index 75f2b80e5f..5b20d6d013 100644
--- a/gnu/packages/dunst.scm
+++ b/gnu/packages/dunst.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015, 2017, 2018 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,6 +27,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -52,9 +54,16 @@
                           ;; Otherwise it tries to install service file
                           ;; to "dbus" store directory.
                           (string-append "SERVICEDIR_DBUS=" %output
-                                         "/share/dbus-1/services"))
+                                         "/share/dbus-1/services")
+                          "dunstify")
        #:phases (modify-phases %standard-phases
-                  (delete 'configure))))
+                  (delete 'configure)
+                  (add-after 'install 'install-dunstify
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out")))
+                        (install-file "dunstify"
+                                      (string-append out "/bin")))
+                      #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("perl" ,perl)                   ; for pod2man
@@ -65,6 +74,7 @@
        ("glib" ,glib)
        ("cairo" ,cairo)
        ("pango" ,pango)
+       ("libnotify" ,libnotify)         ; for dunstify
        ("libx11" ,libx11)
        ("libxscrnsaver" ,libxscrnsaver)
        ("libxinerama" ,libxinerama)
-- 
2.25.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [bug#39522] [PATCH] gnu: dunst: Build dunstify.
  2020-02-09 23:45 ` Nicolas Goaziou
@ 2020-02-10  8:57   ` Brice Waegeneire
  2020-02-11 18:26     ` bug#39522: " Nicolas Goaziou
  0 siblings, 1 reply; 6+ messages in thread
From: Brice Waegeneire @ 2020-02-10  8:57 UTC (permalink / raw)
  To: Nicolas Goaziou; +Cc: 39522, Guix-patches

On 2020-02-09 23:45, Nicolas Goaziou wrote:
> I suggest to use
> 
>   (install-file "dunstify" (string-append out "/bin"))
> 
> instead.
> 
> Also, the phase must end with #t.
> 
> Could you send an updated patch?
I wrote a new patch with your suggestion.
Sorry for the missing copyright lines in the previous patches you 
merged, I thought it was non-mandatory on trivial modifications. I added 
one in this new one.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#39522: [PATCH] gnu: dunst: Build dunstify.
  2020-02-10  8:57   ` Brice Waegeneire
@ 2020-02-11 18:26     ` Nicolas Goaziou
  0 siblings, 0 replies; 6+ messages in thread
From: Nicolas Goaziou @ 2020-02-11 18:26 UTC (permalink / raw)
  To: Brice Waegeneire; +Cc: 39522-done

Hello,

Brice Waegeneire <brice@waegenei.re> writes:

> I wrote a new patch with your suggestion.

Thank you! I applied it as 81565d23df3080b4d43d2ce0bfa49251827a34e9.

> Sorry for the missing copyright lines in the previous patches you
> merged, I thought it was non-mandatory on trivial modifications.

I honestly do not know if it is mandatory in this case. However, trivial
modifications may pile up and it could become a concern at some point.

> I added one in this new one.

Yay!

Regards,

-- 
Nicolas Goaziou

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#39522] When to add a copyright line?
       [not found] ` <handler.39522.D39522.15814455763176.notifdone@debbugs.gnu.org>
@ 2020-02-14 14:04   ` Ludovic Courtès
  0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2020-02-14 14:04 UTC (permalink / raw)
  To: Brice Waegeneire, 39522, Nicolas Goaziou

Hello!

> Brice Waegeneire <brice@waegenei.re> writes:
>
>> I wrote a new patch with your suggestion.
>
> Thank you! I applied it as 81565d23df3080b4d43d2ce0bfa49251827a34e9.
>
>> Sorry for the missing copyright lines in the previous patches you
>> merged, I thought it was non-mandatory on trivial modifications.
>
> I honestly do not know if it is mandatory in this case. However, trivial
> modifications may pile up and it could become a concern at some point.

FWIW, I agree with both of you.  :-)

Technically, a contribution is not considered “legally significant” if
it is below 15 lines of code or so (info "(maintain) Legally
Significant").

Furthermore, copyright only applies to things that are “inventive”,
which typically means there’s more than one way to do it.  Thus, one
could argue about whether some of our package definitions are
copyrightable at all (in the EU, there’s a “sui generis” database right
though, so it could fall under that, but IANAL.)

Anyway, long story short: I agree with Nicolas that it’s easier to just
always add a copyright line, and it’s better than forgetting to add one.

Ludo’.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-02-14 14:05 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-09  9:11 [bug#39522] [PATCH] gnu: dunst: Build dunstify Brice Waegeneire
2020-02-09 23:45 ` Nicolas Goaziou
2020-02-10  8:57   ` Brice Waegeneire
2020-02-11 18:26     ` bug#39522: " Nicolas Goaziou
2020-02-10  8:51 ` [bug#39522] [PATCH v2] " Brice Waegeneire
     [not found] ` <handler.39522.D39522.15814455763176.notifdone@debbugs.gnu.org>
2020-02-14 14:04   ` [bug#39522] When to add a copyright line? Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).