guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

19/20: gnu: lsyncd: Search $PATH for binaries.


From: guix-commits
Subject: 19/20: gnu: lsyncd: Search $PATH for binaries.
Date: Wed, 21 Aug 2019 18:48:57 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit d0d54a61d3c245d32f1de3427fe279a5de4ea9f1
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Mon Jun 3 18:50:58 2019 +0200

    gnu: lsyncd: Search $PATH for binaries.
    
    * gnu/packages/sync.scm (lsyncd)[arguments]: Add
    ‘search-$PATH-for-binaries’ phase.
---
 gnu/packages/sync.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 1c80b79..ccebe40 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -183,8 +183,20 @@ their folder.
        #:test-target "tests"
        #:phases
        (modify-phases %standard-phases
-         ;; No install target.
+         (add-after 'unpack 'search-$PATH-for-binaries
+           ;; lsyncd requires and hard-codes absolute file names to binaries.
+           ;; Make it fall back to searching $PATH for relative file names.
+           (lambda _
+             (substitute* "lsyncd.c"
+               (("execv\\(") "execvp("))
+             (substitute* (list "lsyncd.lua"
+                                "default-direct.lua"
+                                "default-rsync.lua"
+                                "default-rsyncssh.lua")
+               (("(|/usr)/bin/") ""))
+             #t))
          (replace 'install
+           ;; No install target.
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]