diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-12-10 21:49:25 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-12-10 21:49:25 +0100 |
| commit | 32750e8c3ed38df4cafb39cffa878c6851abc899 (patch) | |
| tree | dcf40b321c3b492bd1d00244c78f72160e66a554 /gnu/packages/terminals.scm | |
| parent | 6104071e483095f9fea9700e0317e84f64102ae2 (diff) | |
| parent | e1e32303129c5aedc7236d5cc854d6b72ad35daf (diff) | |
| download | guix-32750e8c3ed38df4cafb39cffa878c6851abc899.tar.gz | |
Merge remote-tracking branch 'signed/master' into core-updates
Diffstat (limited to 'gnu/packages/terminals.scm')
| -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 292c101407..dbe1afd829 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 check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -972,9 +973,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) @@ -995,6 +1000,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 |