nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

self: Use #:guile-for-build in the shebang of the 'guix' executable. 

* guix/self.scm (guix-command): Add #:guile and pass it to 'program-file'.
(whole-package): Add #:guile and pass it to 'guix-command'.
(compiled-guix): Pass #:guile to 'guix-command' and 'whole-package'.
This commit is contained in:
Ludovic Courtès 2018-07-02 14:50:36 +02:00
parent 223fa5b327
commit 8970a886e6
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/self.scm
View File

@ -343,7 +343,7 @@ DOMAIN, a gettext domain."
(define* (guix-command modules #:optional compiled-modules
#:key source (dependencies '())
(guile-version (effective-version)))
guile (guile-version (effective-version)))
"Return the 'guix' command such that it adds MODULES and DEPENDENCIES in its
load path."
(program-file "guix-command"
@ -383,15 +383,17 @@ load path."
;; XXX: It would be more convenient to change it to:
;; (exit (apply guix-main (command-line)))
(apply guix-main (command-line))))))
(apply guix-main (command-line))))
#:guile guile))
(define* (whole-package name modules dependencies
#:key
(guile-version (effective-version))
compiled-modules
info daemon
info daemon guile
(command (guix-command modules
#:dependencies dependencies
#:guile guile
#:guile-version guile-version)))
"Return the whole Guix package NAME that uses MODULES, a derivation of all
the modules, and DEPENDENCIES, a list of packages depended on. COMMAND is the
@ -630,10 +632,12 @@ assumed to be part of MODULES."
(command (guix-command modules compiled
#:source source
#:dependencies dependencies
#:guile guile-for-build
#:guile-version guile-version)))
(whole-package name modules dependencies
#:compiled-modules compiled
#:command command
#:guile guile-for-build
;; Include 'guix-daemon'. XXX: Here we inject an
;; older snapshot of guix-daemon, but that's a good