03/05: gnu: modules: Avoid FHS file names in 'add.modules'.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 7273b669458db959dfa87edc61f916bab91c6112
Author: Ludovic Courtès <ludovic.courtes@inria.fr>
AuthorDate: Fri Jul 23 17:01:38 2021 +0200

    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 d3dc8e5..15ff607 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.