futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: fzf: Wrap with a compliant find(1).

Browse Source 
* 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>.
This commit is contained in:
Tobias Geerinckx-Rice 2021-12-08 18:12:45 +01:00
parent 852ad65bd4
commit 9bac41c2b8
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/terminals.scm
View File

@ -61,6 +61,7 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages build-tools) ;for meson-0.55 #:use-module (gnu packages build-tools) ;for meson-0.55
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
@ -974,9 +975,13 @@ usable with any list--including files, command history, processes and more.")
(string-append out "/bin")))))) (string-append out "/bin"))))))
(add-after 'copy-binaries 'wrap-programs (add-after 'copy-binaries 'wrap-programs
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(findutils (assoc-ref inputs "findutils"))
(ncurses (assoc-ref inputs "ncurses"))) (ncurses (assoc-ref inputs "ncurses")))
(wrap-program (string-append out "/bin/fzf-tmux") (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"))))))) `("PATH" ":" prefix (,(string-append ncurses "/bin")))))))
(add-after 'install 'install-completions (add-after 'install 'install-completions
(lambda* (#:key outputs #:allow-other-keys) (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")))))))))) (string-append zsh-completion "/_fzf"))))))))))
(inputs (inputs
`(,@(package-inputs go-github-com-junegunn-fzf) `(,@(package-inputs go-github-com-junegunn-fzf)
("findutils" ,findutils)
("ncurses" ,ncurses))))) ("ncurses" ,ncurses)))))
(define-public go-github.com-howeyc-gopass (define-public go-github.com-howeyc-gopass