From 6920b87a9cb22c0a5c2ceaf6b6ca852a8e094732 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 25 Jul 2021 11:43:05 +0200 Subject: [PATCH] build: utils: Trim trailing slashes from search-input-file input. Make sure that both: (search-input-file inputs "/bin/sh") and (search-input-file inputs "bin/sh") are supported. * guix/build/utils (search-input-file): Trim starting slash character from FILE. --- guix/build/utils.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index e7782d3e08..3beb7da67a 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -631,8 +631,11 @@ FILE must be a string like \"bin/sh\". If FILE is not found, an exception is raised." (match inputs (((_ . directories) ...) - (or (search-path directories file) - (raise (condition (&search-error (path directories) (file file)))))))) + ;; Accept both "bin/sh" and "/bin/sh" as FILE argument. + (let ((file (string-trim file #\/))) + (or (search-path directories file) + (raise + (condition (&search-error (path directories) (file file))))))))) (define (search-input-directory inputs directory) "Find a sub-directory named DIRECTORY among the INPUTS and return its -- 2.32.0