diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-09 22:05:29 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-09 22:10:01 +0100 |
| commit | f5768afa333bbc8167ef2e33db44c9bb64bef0be (patch) | |
| tree | b44b74586c82b3f4637512228664e44f214e31a1 | |
| parent | 834129e0e2984fa615c8958de3964dabd7f6972c (diff) | |
| download | patches-f5768afa333bbc8167ef2e33db44c9bb64bef0be.tar patches-f5768afa333bbc8167ef2e33db44c9bb64bef0be.tar.gz | |
build: Change state and log directories to $localstatedir/.../guix.
* daemon.am (libstore_a_CPPFLAGS): Change /nix to /guix.
* guix/config.scm.in (%state-directory): Likewise.
* guix/store.scm (log-file): Likewise.
| -rw-r--r-- | daemon.am | 4 | ||||
| -rw-r--r-- | guix/config.scm.in | 2 | ||||
| -rw-r--r-- | guix/store.scm | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -112,8 +112,8 @@ libstore_a_CPPFLAGS = \ -I$(top_builddir)/nix/libstore \ -DNIX_STORE_DIR=\"$(storedir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \ - -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ - -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \ + -DNIX_STATE_DIR=\"$(localstatedir)/guix\" \ + -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\" \ -DNIX_CONF_DIR=\"$(sysconfdir)/guix\" \ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \ diff --git a/guix/config.scm.in b/guix/config.scm.in index 5edb4ced30..eaadae9618 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -57,7 +57,7 @@ (define %state-directory ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'. - (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/nix")) + (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix")) (define %config-directory ;; This must match `NIX_CONF_DIR' as defined in `daemon.am'. diff --git a/guix/store.scm b/guix/store.scm index e92e159ff4..75edb340ae 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -827,7 +827,7 @@ must be an absolute store file name, or a derivation file name." (cond ((derivation-path? file) (let* ((base (basename file)) (log (string-append (dirname %state-directory) ; XXX - "/log/nix/drvs/" + "/log/guix/drvs/" (string-take base 2) "/" (string-drop base 2))) (log.bz2 (string-append log ".bz2"))) |