diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-12-29 15:52:50 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-12-29 15:57:24 +0100 |
| commit | 3f40cfdeceab121101fc6aaddc55ccb7a0be3e7f (patch) | |
| tree | 108b6793a5faffcca03ab0f1d0c27381cbcdf941 /guix/config.scm.in | |
| parent | 04d4c8a439c035cf41296eafc23a5dfe196c24db (diff) | |
| download | patches-3f40cfdeceab121101fc6aaddc55ccb7a0be3e7f.tar patches-3f40cfdeceab121101fc6aaddc55ccb7a0be3e7f.tar.gz | |
config: Export '%config-directory'.
* configure.ac: Define and substitute 'guix_sysconfdir'.
* guix/config.scm.in (%config-directory): New variable.
Diffstat (limited to 'guix/config.scm.in')
| -rw-r--r-- | guix/config.scm.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/guix/config.scm.in b/guix/config.scm.in index 772ea8c289..4835c6e5d9 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -23,6 +23,7 @@ %guix-home-page-url %store-directory %state-directory + %config-directory %system %libgcrypt %nixpkgs @@ -56,6 +57,10 @@ ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'. "@guix_localstatedir@/nix") +(define %config-directory + ;; This must match `NIX_CONF_DIR' as defined in `daemon.am'. + (or (getenv "NIX_CONF_DIR") "@guix_sysconfdir@/guix")) + (define %system "@guix_system@") |