summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2022-10-30 02:00:00 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2022-10-30 02:00:01 +0100
commit08d60c8691f1ce2291c557022257170881567d76 (patch)
treecebeade3b7c8875eb358c2c5979982579e024852 /gnu
parentc744992715225acb1b2681ae69e0448878a6146c (diff)
downloadguix-08d60c8691f1ce2291c557022257170881567d76.tar.gz
gnu: dehydrated: Don't rely on implicit input labels.
* gnu/packages/tls.scm (dehydrated)[arguments]:
Use SEARCH-INPUT-FILE instead of ASSOC-REF.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/tls.scm25
1 files 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