summaryrefslogtreecommitdiffstats
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
parentgnu: gcc-objc, gcc-objc++: Declare variants for GCC 11 and GCC 12. (diff)
downloadguix-d418031a8cbdea4e2bc5c52ea1b29ad369579bae.tar.gz
guix-d418031a8cbdea4e2bc5c52ea1b29ad369579bae.tar.bz2
guix-d418031a8cbdea4e2bc5c52ea1b29ad369579bae.tar.xz
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 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2017-2022 Ludovic Courtès <ludo@gnu.org>
3;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> 3;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
4;;; 4;;;
5;;; This file is part of GNU Guix. 5;;; This file is part of GNU Guix.
@@ -699,7 +699,8 @@ Info manual."
699 (setenv "NIX_STORE_DIR" #$%storedir)) 699 (setenv "NIX_STORE_DIR" #$%storedir))
700 700
701 (apply execl #$(file-append daemon "/bin/guix-daemon") 701 (apply execl #$(file-append daemon "/bin/guix-daemon")
702 "guix-daemon" (cdr (command-line)))))) 702 "guix-daemon" (cdr (command-line))))
703 #:guile guile))
703 704
704 (computed-file name 705 (computed-file name
705 (with-imported-modules '((guix build utils)) 706 (with-imported-modules '((guix build utils))