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

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.
This commit is contained in:
Ludovic Courtès 2018-11-05 23:26:37 +01:00
parent aa919fbc89
commit 8d3beb3a44
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
guix/self.scm
View File

@ -408,7 +408,8 @@ load path."
#:key #:key
(guile-version (effective-version)) (guile-version (effective-version))
compiled-modules compiled-modules
info daemon guile info daemon substitute-keys
guile
(command (guix-command modules (command (guix-command modules
#:dependencies dependencies #:dependencies dependencies
#:guile guile #:guile guile
@ -430,6 +431,13 @@ assumed to be part of MODULES."
(symlink (string-append #$daemon "/bin/guix-daemon") (symlink (string-append #$daemon "/bin/guix-daemon")
(string-append #$output "/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 (let ((modules (string-append #$output
"/share/guile/site/" "/share/guile/site/"
(effective-version))) (effective-version)))
@ -666,6 +674,8 @@ assumed to be part of MODULES."
'guix-daemon) 'guix-daemon)
#:info (info-manual source) #:info (info-manual source)
#:substitute-keys (sub-directory source
"etc/substitutes")
#:guile-version guile-version))) #:guile-version guile-version)))
((= 0 pull-version) ((= 0 pull-version)
;; Legacy 'guix pull': return the .scm and .go files as one ;; Legacy 'guix pull': return the .scm and .go files as one