From 9bac41c2b8e7be5ab713402591ceeb32c635c214 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 8 Dec 2021 18:12:45 +0100
Subject: gnu: fzf: Wrap with a compliant find(1).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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>.
---
 gnu/packages/terminals.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/terminals.scm')

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 @@ (define-module (gnu packages terminals)
   #: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 @@ (define-public fzf
                                 (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 @@ (define-public fzf
                              (string-append zsh-completion "/_fzf"))))))))))
     (inputs
      `(,@(package-inputs go-github-com-junegunn-fzf)
+       ("findutils" ,findutils)
        ("ncurses" ,ncurses)))))
 
 (define-public go-github.com-howeyc-gopass
-- 
cgit v1.2.3