From 7273b669458db959dfa87edc61f916bab91c6112 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Fri, 23 Jul 2021 17:01:38 +0200
Subject: gnu: modules: Avoid FHS file names in 'add.modules'.

* gnu/packages/package-management.scm (modules)[arguments]: Add
'patch-add-modules' phase.
---
 gnu/packages/package-management.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index d3dc8e593b..15ff607ab0 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1522,6 +1522,14 @@ from R7RS, which allows most R7RS code to run on R6RS implementations.")
         #:test-target "test"
         #:phases
         (modify-phases %standard-phases
+          (add-before 'configure 'patch-add-modules
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((coreutils (assoc-ref inputs "coreutils")))
+                (substitute* "script/add.modules.in"
+                  (("/bin/(cat|cp|rm)" _ command)
+                   (string-append coreutils "/bin/" command))
+                  (("/bin/echo")
+                   "echo")))))
           (add-before 'configure 'patch-scripts-for-python-3
             (lambda _
               ;; Patch the script for python-3.
-- 
cgit v1.2.3

/tree/tests/print.scm?id=e047b265179b07562a9165200097b2624b58d7c6'>tree</a><a href='/guix/commit/tests/print.scm?id=e047b265179b07562a9165200097b2624b58d7c6'>commit</a><a href='/guix/diff/tests/print.scm?id=e047b265179b07562a9165200097b2624b58d7c6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/print.scm'>
<input type='hidden' name='id' value='e047b265179b07562a9165200097b2624b58d7c6'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=e047b265179b07562a9165200097b2624b58d7c6'>root</a>/<a href='/guix/log/tests?id=e047b265179b07562a9165200097b2624b58d7c6'>tests</a>/<a href='/guix/log/tests/print.scm?id=e047b265179b07562a9165200097b2624b58d7c6'>print.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/print.scm?id=e047b265179b07562a9165200097b2624b58d7c6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-04-20 10:57:49 +0200'>2020-04-20</span></td><td><a href='/guix/commit/tests/print.scm?id=10af34cd7f1f4f9fb50db826d06233c83a9c0439'>tests: Update expected values for package-&gt;code.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>