From: "Clément Lassieur" <clement@lassieur.org>
To: 46235@debbugs.gnu.org
Subject: [bug#46235] [PATCH] gnu: emacs-rg: Fix use on remote systems.
Date: Mon, 1 Feb 2021 13:47:21 +0100 [thread overview]
Message-ID: <20210201124721.3767-1-clement@lassieur.org> (raw)
* gnu/packages/emacs-xyz.scm (emacs-rg)[inputs]: Remove. Move ripgrep to...
[propagated-inputs]: ... here. This also gives access to ripgrep's manual.
[arguments]: Replace the full path with the executable name.
---
gnu/packages/emacs-xyz.scm | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 28c7b41d79..ba1865d05f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19,7 +19,7 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2017, 2018, 2019, 2020 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2017, 2018, 2019, 2020, 2021 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017, 2018 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
@@ -3848,19 +3848,18 @@ result.")
(arguments
'(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'hardcode-rg-path
- ;; Hardcode the path to ripgrep.
+ (add-after 'unpack 'remove-rg-path
+ ;; Remove the path to ripgrep so that it works on remote systems.
(lambda _
(let ((file "rg.el"))
(chmod file #o644)
(emacs-substitute-sexps file
- ("(defcustom rg-executable" (which "rg")))))))))
+ ("(defcustom rg-executable" "rg"))))))))
(propagated-inputs
`(("emacs-s" ,emacs-s)
("emacs-transient" ,emacs-transient)
- ("emacs-wgrep" ,emacs-wgrep)))
- (inputs
- `(("ripgrep" ,ripgrep)))
+ ("emacs-wgrep" ,emacs-wgrep)
+ ("ripgrep" ,ripgrep)))
(home-page "https://rgel.readthedocs.io/en/latest/")
(synopsis "Search tool based on @code{ripgrep}")
(description
--
2.30.0
next reply other threads:[~2021-02-01 12:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 12:47 Clément Lassieur [this message]
2021-02-02 8:27 ` [bug#46235] [PATCH] gnu: emacs-rg: Fix use on remote systems Nicolas Goaziou
2021-02-02 8:56 ` bug#46235: " Clément Lassieur
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=20210201124721.3767-1-clement@lassieur.org \
--to=clement@lassieur.org \
--cc=46235@debbugs.gnu.org \
/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).