diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-05 23:02:47 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-06 00:07:17 +0100 |
| commit | d8eea3d2bce9c9e834210237090947de4600cfe8 (patch) | |
| tree | 5572df7de406f06b31f6be7d68526f69208442b1 /guix/utils.scm | |
| parent | 69cfce50dbb2000c5f5d98f0f364fe324004bf99 (diff) | |
| download | gnu-guix-d8eea3d2bce9c9e834210237090947de4600cfe8.tar gnu-guix-d8eea3d2bce9c9e834210237090947de4600cfe8.tar.gz | |
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.scm | 3 |
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: |