[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: self: Install substitute keys.
From: |
Ludovic Courtès |
Subject: |
05/05: self: Install substitute keys. |
Date: |
Mon, 5 Nov 2018 18:04:22 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 8d3beb3a44b619d46715dbc4ccad4acfe0a1dcde
Author: Ludovic Courtès <address@hidden>
Date: Mon Nov 5 23:26:37 2018 +0100
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.
---
guix/self.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/guix/self.scm b/guix/self.scm
index 40ef528..4548e6c 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