amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: emacs-rg: Fix use on remote systems.

Browse source 
* 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.
This commit is contained in:
Clément Lassieur 2021-02-01 13:47:21 +01:00
parent 0319f9fac2
commit 13b2c44e5a
No known key found for this signature in database
GPG key ID: 89F96D4808F359C7
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/emacs-xyz.scm
View file

@ -19,7 +19,7 @@
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; 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 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017, 2018 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2017, 2018 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
@ -3851,19 +3851,18 @@ result.")
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'hardcode-rg-path (add-after 'unpack 'remove-rg-path
;; Hardcode the path to ripgrep. ;; Remove the path to ripgrep so that it works on remote systems.
(lambda _ (lambda _
(let ((file "rg.el")) (let ((file "rg.el"))
(chmod file #o644) (chmod file #o644)
(emacs-substitute-sexps file (emacs-substitute-sexps file
("(defcustom rg-executable" (which "rg"))))))))) ("(defcustom rg-executable" "rg"))))))))
(propagated-inputs (propagated-inputs
`(("emacs-s" ,emacs-s) `(("emacs-s" ,emacs-s)
("emacs-transient" ,emacs-transient) ("emacs-transient" ,emacs-transient)
("emacs-wgrep" ,emacs-wgrep))) ("emacs-wgrep" ,emacs-wgrep)
(inputs ("ripgrep" ,ripgrep)))
`(("ripgrep" ,ripgrep)))
(home-page "https://rgel.readthedocs.io/en/latest/") (home-page "https://rgel.readthedocs.io/en/latest/")
(synopsis "Search tool based on @code{ripgrep}") (synopsis "Search tool based on @code{ripgrep}")
(description (description