diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-12-08 18:12:45 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-12-08 18:13:48 +0100 |
| commit | 9bac41c2b8e7be5ab713402591ceeb32c635c214 (patch) | |
| tree | 4dfb07174adeca2e7bcb2a8f2aea662e74034425 /gnu | |
| parent | 852ad65bd45a81a441a85318badf17a005cad111 (diff) | |
| download | guix-9bac41c2b8e7be5ab713402591ceeb32c635c214.tar.gz guix-9bac41c2b8e7be5ab713402591ceeb32c635c214.zip | |
gnu: fzf: Wrap with a compliant find(1).
* gnu/packages/terminals.scm (fzf)[inputs]: Add findutils.
[arguments]: Wrap the ‘fzf’ executable with its /bin directory in $PATH.
Addresses <https://issues.guix.gnu.org/52372>.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/terminals.scm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 778a592dc6..1b88d3813b 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -61,6 +61,7 @@ #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages build-tools) ;for meson-0.55 #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -974,9 +975,13 @@ usable with any list--including files, command history, processes and more.") (string-append out "/bin")))))) (add-after 'copy-binaries 'wrap-programs (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (ncurses (assoc-ref inputs "ncurses"))) - (wrap-program (string-append out "/bin/fzf-tmux") + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (findutils (assoc-ref inputs "findutils")) + (ncurses (assoc-ref inputs "ncurses"))) + (wrap-program (string-append bin "/fzf") + `("PATH" ":" prefix (,(string-append findutils "/bin")))) + (wrap-program (string-append bin "/fzf-tmux") `("PATH" ":" prefix (,(string-append ncurses "/bin"))))))) (add-after 'install 'install-completions (lambda* (#:key outputs #:allow-other-keys) @@ -997,6 +1002,7 @@ usable with any list--including files, command history, processes and more.") (string-append zsh-completion "/_fzf")))))))))) (inputs `(,@(package-inputs go-github-com-junegunn-fzf) + ("findutils" ,findutils) ("ncurses" ,ncurses))))) (define-public go-github.com-howeyc-gopass |