01/08: self: 'guix-daemon' wrapper refers to the right Guile.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit d418031a8cbdea4e2bc5c52ea1b29ad369579bae
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Jun 26 15:33:17 2022 +0200

    self: 'guix-daemon' wrapper refers to the right Guile.
    
    Partly fixes <https://issues.guix.gnu.org/56030>.
    Reported by Julien Lepiller <julien@lepiller.eu>.
    
    * guix/self.scm (whole-package)[wrap]: Pass #:guile to 'program-file'.
---
 guix/self.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/self.scm b/guix/self.scm
index 36ada4d171..d1ccec8a49 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017-2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -699,7 +699,8 @@ Info manual."
                         (setenv "NIX_STORE_DIR" #$%storedir))
 
                       (apply execl #$(file-append daemon "/bin/guix-daemon")
-                             "guix-daemon" (cdr (command-line))))))
+                             "guix-daemon" (cdr (command-line))))
+                  #:guile guile))
 
   (computed-file name
                  (with-imported-modules '((guix build utils))