unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: Damien Cassou <damien@cassou.me>
Cc: 39922-done@debbugs.gnu.org
Subject: bug#39922: [PATCH] Add clipnotify and clipmenu
Date: Wed, 11 Mar 2020 18:44:47 +0100	[thread overview]
Message-ID: <878sk6hjlc.fsf@gnu.org> (raw)
In-Reply-To: <87wo7zhzds.fsf@cassou.me> (Damien Cassou's message of "Thu, 05 Mar 2020 11:25:35 +0100")

Hi Damien,

Damien Cassou <damien@cassou.me> skribis:

>>From f6f5ed7f4d5ba8a75f8783a7958b6f73d43644dd Mon Sep 17 00:00:00 2001
> From: Damien Cassou <damien@cassou.me>
> 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 <damien@cassou.me>
> 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’.

      reply	other threads:[~2020-03-11 17:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-05 10:25 [bug#39922] [PATCH] Add clipnotify and clipmenu Damien Cassou
2020-03-11 17:44 ` Ludovic Courtès [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=878sk6hjlc.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=39922-done@debbugs.gnu.org \
    --cc=damien@cassou.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).