From 08d60c8691f1ce2291c557022257170881567d76 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Oct 2022 02:00:00 +0100 Subject: gnu: dehydrated: Don't rely on implicit input labels. * gnu/packages/tls.scm (dehydrated)[arguments]: Use SEARCH-INPUT-FILE instead of ASSOC-REF. --- gnu/packages/tls.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 56857ce1e4..b5926f35ad 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1156,18 +1156,19 @@ coding footprint.") (setenv "PATH" bash) (wrap-program "dehydrated" `("PATH" ":" prefix - ,(map (lambda (dir) - (string-append dir "/bin")) - (map (lambda (input) - (assoc-ref %build-inputs input)) - '("coreutils" - "curl" - "diffutils" - "gawk" - "grep" - "openssl" - "sed" - "util-linux-with-udev")))))))))) + ,(map (lambda (file) + (dirname (search-input-file %build-inputs file))) + (list + ;; From check_dependencies() — keep them in sync. + "bin/grep" + "bin/diff" + "bin/sed" + "bin/awk" + "bin/curl" + "bin/cut" ; also mktemp, head, tail + "bin/hexdump" + ;; Additional requirements. + "bin/openssl"))))))))) (inputs (list bash coreutils -- cgit v1.2.3