summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-06-26 15:33:17 +0200
committerLudovic Courtès <ludo@gnu.org>2022-06-26 23:19:13 +0200
commitd418031a8cbdea4e2bc5c52ea1b29ad369579bae (patch)
treefccb55e067b4b7e6a915bd74f146065632d1f48e
parentb36c41ee54fef177d4a294921d66a1100f38b52b (diff)
downloadguix-patches-d418031a8cbdea4e2bc5c52ea1b29ad369579bae.tar
guix-patches-d418031a8cbdea4e2bc5c52ea1b29ad369579bae.tar.gz
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'.
-rw-r--r--guix/self.scm5
1 files 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))