From 6e499945abf03d928f56ad629d5aa6853ab4cdc5 Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Wed, 23 Apr 2025 02:03:52 +0100
Subject: command-line-tool: Strip store hash when copying out of the store.

Without stripping the hashes, the primary and secondary files have
different hash prefixes. This interferes with successful command
execution.

* ravanan/command-line-tool.scm (copy-input-files-gexp): Strip store
hash when copying files out of the store into the temporary inputs
directory. Update basename, nameroot and nameext accordingly.
---
 ravanan/command-line-tool.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ravanan/command-line-tool.scm b/ravanan/command-line-tool.scm
index ce4bdbc..c47bb3c 100644
--- a/ravanan/command-line-tool.scm
+++ b/ravanan/command-line-tool.scm
@@ -493,7 +493,7 @@ The returned G-expression will reference an @code{inputs-directory} variable."
      ((eq? (object-type input)
            'File)
       #~,(let ((path-in-inputs-directory
-                (expand-file-name #$(assoc-ref input "basename")
+                (expand-file-name #$(store-item-name (assoc-ref input "path"))
                                   inputs-directory)))
            (copy-file #$(assoc-ref input "path")
                       path-in-inputs-directory)
@@ -502,6 +502,12 @@ The returned G-expression will reference an @code{inputs-directory} variable."
                    (just path-in-inputs-directory))
              (cons "path"
                    (just path-in-inputs-directory))
+             (cons "basename"
+                   (just (basename path-in-inputs-directory)))
+             (cons "nameroot"
+                   (just (file-name-stem path-in-inputs-directory)))
+             (cons "nameext"
+                   (just (file-name-extension path-in-inputs-directory)))
              (cons "secondaryFiles"
                    #$(from-maybe
                       (maybe-let* ((secondary-files
-- 
cgit v1.2.3