bug#39922: [PATCH] Add clipnotify and clipmenu

[Ludovic Courtès]

Hi Damien,

Damien Cassou <address@hidden> skribis:

>>From f6f5ed7f4d5ba8a75f8783a7958b6f73d43644dd Mon Sep 17 00:00:00 2001
> From: Damien Cassou <address@hidden>
> Date: Wed, 4 Mar 2020 16:31:51 +0100
> Subject: [PATCH 1/2] gnu: Add clipnotify.
>
> * gnu/packages/xdisorg.scm (clipnotify): New variable.

Neat!  I added a copyright line for you, let me know if anything’s
wrong!

> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let* ((out  (assoc-ref outputs "out"))
> +                    (bin  (string-append out "/bin"))
> +                    (doc  (string-append %output "/share/doc/" ,name "-" 
> ,version)))
> +               (install-file "clipnotify" bin)
> +               (install-file "README.md" doc)))))

I added a #t here (by convention, phase have to return either #t or #f
currently.)

>>From 6d3202131236adc7f5c38e07541382d04ac68cf1 Mon Sep 17 00:00:00 2001
> From: Damien Cassou <address@hidden>
> Date: Thu, 5 Mar 2020 08:26:23 +0100
> Subject: [PATCH 2/2] gnu: Add clipmenu.
>
> * gnu/packages/xdisorg.scm (clipmenu): New variable.

[...]

> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'fix-hardcoded-paths
> +                  (lambda _
> +                    (substitute* "clipmenud"
> +                      (("has_clipnotify=0") "has_clipnotify=1")
> +                      (("command -v clipnotify >/dev/null 2>&1 && 
> has_clipnotify=1") "")
> +                      (("clipnotify \\|\\| .*") (string-append (which 
> "clipnotify") "\n"))
> +                      (("xsel --logfile") (string-append (which "xsel") " 
> --logfile")))
> +                    (substitute* "clipmenu"
> +                      (("xsel --logfile") (string-append (which "xsel") " 
> --logfile")))

I adjusted the indentation and line length here.

> +         (replace 'install
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let* ((out  (assoc-ref outputs "out"))
> +                    (bin  (string-append out "/bin"))
> +                    (doc  (string-append %output "/share/doc/" ,name "-" 
> ,version)))
> +               (install-file "clipdel" bin)
> +               (install-file "clipmenu" bin)
> +               (install-file "clipmenud" bin)
> +               (install-file "README.md" doc)))))

and added #t here.

> +       #:tests? #f))

Oh, I overlooked that, but usually, when disabling tests, we add a
comment explaining why.

Thanks,
Ludo’.