diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-07-20 22:23:15 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-07-20 22:53:02 +0200 |
| commit | 13cee334f1a31e7d8f7124d045b136106fe8d356 (patch) | |
| tree | 74af2900ae0ef80b8b752c51481e47f0b3abcf38 /guix/config.scm.in | |
| parent | 0b0086e94c68769bfcada7c2b3b426873aac8efc (diff) | |
| download | gnu-guix-13cee334f1a31e7d8f7124d045b136106fe8d356.tar gnu-guix-13cee334f1a31e7d8f7124d045b136106fe8d356.tar.gz | |
pull: Install (guix config) module to override the user's one.
* build-aux/build-self.scm (zlib, gzip, bzip2, xz): New variables.
(build)[storedir, localstatedir, sysconfdir, sbindir]: New variables.
[builder]: Pass them to 'build-guix'.
* guix/build/pull.scm (build-guix): Add #:system, #:storedir,
#:localstatedir, #:sysconfdir, #:sbindir, #:package-name,
#:package-version, #:bug-report-address, #:home-page-url, #:libgcrypt,
#:zlib, #:gzip, #:bzip2, and #:xz. Remove #:gcrypt.
Instantiate all the substitution variables in (guix config). Remove
code to delete OUT/guix/config.{scm,go}.
* guix/config.scm.in: Add note about (guix script pull).
Diffstat (limited to 'guix/config.scm.in')
| -rw-r--r-- | guix/config.scm.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/config.scm.in b/guix/config.scm.in index 7a420401ce..8f2c4abd8e 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -42,7 +42,8 @@ ;;; Commentary: ;;; -;;; Compile-time configuration of Guix. +;;; Compile-time configuration of Guix. When adding a substitution variable +;;; here, make sure to equip (guix scripts pull) to substitute it. ;;; ;;; Code: |