summaryrefslogtreecommitdiff
path: root/guix/utils.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-12-05 23:02:47 +0100
committerLudovic Courtès <ludo@gnu.org>2012-12-06 00:07:17 +0100
commitd8eea3d2bce9c9e834210237090947de4600cfe8 (patch)
tree5572df7de406f06b31f6be7d68526f69208442b1 /guix/utils.scm
parent69cfce50dbb2000c5f5d98f0f364fe324004bf99 (diff)
build: Capture configure-time settings in (guix config).
* configure.ac: Compute and substitute `guix_localstatedir'. * m4/guix.m4: Substitute `guix_system'. * guix/config.scm.in (%store-directory, %store-directory, %system): New variables. * guix/store.scm (%nix-state-dir): Remove. (%default-socket-path): Use %STATE-DIRECTORY as the default. (%store-prefix): Use %STORE-DIRECTORY as the default. * guix/utils.scm (%current-system): Default to %SYSTEM.
Diffstat (limited to 'guix/utils.scm')
-rw-r--r--guix/utils.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/utils.scm b/guix/utils.scm
index 5ec8f3736d..4089b11cb1 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -342,7 +342,8 @@ returned by `config.guess'."
(define %current-system
;; System type as expected by Nix, usually ARCHITECTURE-KERNEL.
- (make-parameter (gnu-triplet->nix-system %host-type)))
+ ;; By default, this is equal to (gnu-triplet->nix-system %host-type).
+ (make-parameter %system))
(define (package-name->name+version name)
"Given NAME, a package name like \"foo-0.9.1b\", return two values: