[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))
- branch master updated (97285a431b -> bdb2e262fc), guix-commits, 2022/07/27
- 03/14: gnu: btrbk: Use SEARCH-INPUT-FILES.,
guix-commits <=
- 09/14: gnu: duc: Run tests., guix-commits, 2022/07/27
- 07/14: gnu: Add mce-inject., guix-commits, 2022/07/27
- 12/14: gnu: console-setup: Clean up #:make-flags., guix-commits, 2022/07/27
- 10/14: gnu: console-setup: Update to 1.209., guix-commits, 2022/07/27
- 05/14: gnu: pegtl: Update to 3.2.7., guix-commits, 2022/07/27
- 04/14: gnu: libkeyfinder: Update to 2.2.7., guix-commits, 2022/07/27
- 13/14: gnu: console-setup: Use G-expressions., guix-commits, 2022/07/27
- 08/14: gnu: duc: Update to 1.4.5., guix-commits, 2022/07/27
- 01/14: gnu: btrbk: Add findutils to PATH., guix-commits, 2022/07/27
- 02/14: gnu: btrbk: Update to 0.32.2., guix-commits, 2022/07/27