branch version-1.2.0 updated: gnu: guix: Use libexec/guix/guile in the 'guix' shebang.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch version-1.2.0
in repository guix.

The following commit(s) were added to refs/heads/version-1.2.0 by this push:
     new 37c21b1  gnu: guix: Use libexec/guix/guile in the 'guix' shebang.
37c21b1 is described below

commit 37c21b130c0072f23bb735ca6903d8711416d5d9
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Nov 16 23:05:49 2020 +0100

    gnu: guix: Use libexec/guix/guile in the 'guix' shebang.
    
    This is a followup to 880fe019ae64df37815bbdb1a22305f99dae759d.
    
    * gnu/packages/package-management.scm (guix)[arguments]: Delete
    'patch-shebangs' phase.
---
 gnu/packages/package-management.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 86e3f2b..512f195 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -336,7 +336,13 @@ $(prefix)/etc/init.d\n")))
                             (let ((bash (assoc-ref inputs "bash")))
                               (substitute* (string-append out "/bin/guix")
                                 (("^#!.*/bash") (string-append "#! " bash 
"/bin/bash")))))
-                          #t))))))
+                          #t)))
+
+                    ;; The 'guix' executable has 'OUT/libexec/guix/guile' has
+                    ;; its shebang; that should remain unchanged, thus remove
+                    ;; the 'patch-shebangs' phase, which would otherwise
+                    ;; change it to 'GUILE/bin/guile'.
+                    (delete 'patch-shebangs))))
       (native-inputs `(("pkg-config" ,pkg-config)
 
                        ;; Guile libraries are needed here for