diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-06-14 21:59:23 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-06-14 23:34:59 +0200 |
| commit | baed923682802b7281bd68274f080d2bb55d3eff (patch) | |
| tree | 44b3c9e9460f179ff741292d4296499bf56aee07 /guix/self.scm | |
| parent | 0effadcad538241e0cd4ae49a7dececfbb3a8782 (diff) | |
| download | gnu-guix-baed923682802b7281bd68274f080d2bb55d3eff.tar gnu-guix-baed923682802b7281bd68274f080d2bb55d3eff.tar.gz | |
self: Add 'guix-daemon' to the result.
* gnu/packages/package-management.scm (guix-daemon): New variable.
* guix/self.scm (whole-package): Add #:daemon and honor it.
(compiled-guix): Pass #:daemon to 'whole-package'.
Diffstat (limited to 'guix/self.scm')
| -rw-r--r-- | guix/self.scm | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/guix/self.scm b/guix/self.scm index 3023ae379b..1306df46f5 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -385,7 +385,7 @@ load path." (define* (whole-package name modules dependencies #:key (guile-version (effective-version)) - info + info daemon (command (guix-command modules #:dependencies dependencies #:guile-version guile-version))) @@ -401,6 +401,10 @@ the modules, and DEPENDENCIES, a list of packages depended on. COMMAND is the (symlink #$command (string-append #$output "/bin/guix")) + (when #$daemon + (symlink (string-append #$daemon "/bin/guix-daemon") + (string-append #$output "/bin/guix-daemon"))) + (let ((modules (string-append #$output "/share/guile/site/" (effective-version))) @@ -611,6 +615,15 @@ the modules, and DEPENDENCIES, a list of packages depended on. COMMAND is the #:guile-version guile-version))) (whole-package name built-modules dependencies #:command command + + ;; Include 'guix-daemon'. XXX: Here we inject an + ;; older snapshot of guix-daemon, but that's a good + ;; enough approximation for now. + #:daemon (module-ref (resolve-interface + '(gnu packages + package-management)) + 'guix-daemon) + #:info (info-manual source) #:guile-version guile-version))) ((= 0 pull-version) |