From f1b727c263926a469e6035485e92cfe7a17e2497 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: 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(-) (limited to 'gnu/packages') 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 @@ (define btrbk (search-input-file outputs "bin/btrbk")) (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)) -- cgit v1.2.3