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/config.scm.in | |
| 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/config.scm.in')
| -rw-r--r-- | guix/config.scm.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/guix/config.scm.in b/guix/config.scm.in index 462dcd0ed1..4717b1c967 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -20,6 +20,9 @@ #:export (%guix-package-name %guix-version %guix-bug-report-address + %store-directory + %state-directory + %system %libgcrypt %nixpkgs %nix-instantiate)) @@ -39,6 +42,15 @@ (define %guix-bug-report-address "@PACKAGE_BUGREPORT@") +(define %store-directory + "@storedir@") + +(define %state-directory + "@guix_localstatedir@") + +(define %system + "@guix_system@") + (define %libgcrypt "@LIBGCRYPT@") |