From ba9fdaa81439004889f944f6ccef794abd33c907 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Jul 2023 02:00:01 +0200 Subject: gnu: diffoscope: Don't embed build-time references. * gnu/packages/diffoscope.scm (diffoscope)[arguments]: Avoid using WHICH in the 'embed-tool-references phase. --- gnu/packages/diffoscope.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 61bd23f3e2..5846c4cbd4 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -97,20 +97,22 @@ (define-public diffoscope (delete-file "tests/comparators/test_wasm.py"))) (add-after 'unpack 'embed-tool-references (lambda* (#:key inputs #:allow-other-keys) + (define (bin command) + (search-input-file inputs (string-append "bin/" command))) (substitute* "diffoscope/comparators/utils/compare.py" - (("\\[\"xxd\",") - (string-append "[\"" (which "xxd") "\","))) + (("\\[\"(xxd)\"," _ command) + (string-append "[\"" (bin command) "\","))) (substitute* "diffoscope/diff.py" (("@tool_required\\(\"diff\"\\)") "") - (("get_tool_name\\(\"diff\"\\)") - (string-append "get_tool_name(\"" (which "diff") "\")"))) + (("get_tool_name\\(\"(diff)\"\\)" _ command) + (string-append "get_tool_name(\"" (bin command) "\")"))) (substitute* "diffoscope/comparators/directory.py" (("@tool_required\\(\"stat\"\\)") "") (("@tool_required\\(\"getfacl\"\\)") "") - (("\\[\"stat\",") - (string-append "[\"" (which "stat") "\",")) - (("\\[\"getfacl\",") - (string-append "[\"" (which "getfacl") "\","))))) + (("\\[\"(stat)\"," _ command) + (string-append "[\"" (bin command) "\",")) + (("\\[\"(getfacl)\"," _ command) + (string-append "[\"" (bin command) "\","))))) (add-after 'build 'build-man-page (lambda _ (invoke "make" "-C" "doc"))) -- cgit v1.2.3