diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-11-05 23:26:37 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-11-06 00:04:11 +0100 |
| commit | 8d3beb3a44b619d46715dbc4ccad4acfe0a1dcde (patch) | |
| tree | 5825b26ae023cfb4d5fc7920eedf1e580f14fc96 | |
| parent | aa919fbc890c5438166083f9ff02e4b1968a182b (diff) | |
| download | patches-8d3beb3a44b619d46715dbc4ccad4acfe0a1dcde.tar patches-8d3beb3a44b619d46715dbc4ccad4acfe0a1dcde.tar.gz | |
self: Install substitute keys.
* guix/self.scm (whole-package): Add #:substitute-keys and honor it.
(compiled-guix): Pass #:substitute-keys to 'whole-package' when
PULL-VERSION is one.
| -rw-r--r-- | guix/self.scm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/guix/self.scm b/guix/self.scm index 40ef528ffd..4548e6c044 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -408,7 +408,8 @@ load path." #:key (guile-version (effective-version)) compiled-modules - info daemon guile + info daemon substitute-keys + guile (command (guix-command modules #:dependencies dependencies #:guile guile @@ -430,6 +431,13 @@ assumed to be part of MODULES." (symlink (string-append #$daemon "/bin/guix-daemon") (string-append #$output "/bin/guix-daemon"))) + (when #$substitute-keys + (mkdir-p (string-append #$output "/share/guix")) + (copy-recursively #$substitute-keys + (string-append #$output + "/share/guix") + #:log (%make-void-port "w"))) + (let ((modules (string-append #$output "/share/guile/site/" (effective-version))) @@ -666,6 +674,8 @@ assumed to be part of MODULES." 'guix-daemon) #:info (info-manual source) + #:substitute-keys (sub-directory source + "etc/substitutes") #:guile-version guile-version))) ((= 0 pull-version) ;; Legacy 'guix pull': return the .scm and .go files as one |