guix-commits
[Top][All Lists]
Advanced

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

03/14: gnu: btrbk: Use SEARCH-INPUT-FILES.


From: guix-commits
Subject: 03/14: gnu: btrbk: Use SEARCH-INPUT-FILES.
Date: Wed, 27 Jul 2022 19:08:07 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit f1b727c263926a469e6035485e92cfe7a17e2497
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 24 02:00:00 2022 +0200

    gnu: btrbk: Use SEARCH-INPUT-FILES.
    
    * gnu/packages/backup.scm (btrbk)[arguments]: Use SEARCH-INPUT-FILE to
    construct the wrapper's PATH, rather than hard-coding package variables.
---
 gnu/packages/backup.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index eb6f6a6fa4..2c5fd4abd9 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1121,20 +1121,23 @@ interactive mode.")
                           (string-append "program_name = "
                                          "$ENV{'BTRBK_PROGRAM_NAME'}")))
                        ;; Wrap the script, so that it works with SSH URI and
-                       ;; finds mbuffer out of the box.
+                       ;; finds mbuffer and other tools out of the box.
                        (wrap-program btrbk
                          #:sh (search-input-file inputs "bin/bash")
                          '("BTRBK_PROGRAM_NAME" = ("$0"))
                          `("PATH" prefix
-                           ,(list (string-append #$btrfs-progs "/bin")
-                                  (string-append #$coreutils "/bin")
-                                  (string-append #$findutils "/bin")
-                                  (string-append #$mbuffer "/bin")
-                                  (string-append #$openssh "/bin")))))))))
+                           ,(map (lambda (command)
+                                   (dirname (search-input-file inputs 
command)))
+                                 (list "bin/btrfs"
+                                       "bin/cat"
+                                       "bin/find"
+                                       "bin/mbuffer"
+                                       "bin/ssh")))))))))
     (native-inputs (list ruby-asciidoctor))
     (inputs (list bash-minimal
                   btrfs-progs
                   coreutils
+                  findutils
                   mbuffer
                   openssh
                   perl))



reply via email to

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