Browse Source

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.
gn-latest-20200428
Ludovic Courtès 7 years ago
parent
commit
f5768afa33
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      daemon.am
  2. +1
    -1
      guix/config.scm.in
  3. +1
    -1
      guix/store.scm

+ 2
- 2
daemon.am View File

@@ -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)\" \


+ 1
- 1
guix/config.scm.in View File

@@ -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'.


+ 1
- 1
guix/store.scm View File

@@ -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")))


Loading…
Cancel
Save