From 13b2c44e5abe329e4fad6364601e579d2bddfe1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Mon, 1 Feb 2021 13:47:21 +0100 Subject: gnu: emacs-rg: Fix use on remote systems. * 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 eaf2bf4900..efd80c14c5 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 ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe -;;; Copyright © 2017, 2018, 2019, 2020 Clément Lassieur +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017, 2018 Kyle Meyer ;;; Copyright © 2017 Kei Kebreau @@ -3851,19 +3851,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 -- cgit v1.2.3