nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2014-03-09 22:05:29 +01:00
parent 834129e0e2
commit f5768afa33
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.am
View File

@ -112,8 +112,8 @@ libstore_a_CPPFLAGS = \
-I$(top_builddir)/nix/libstore \ -I$(top_builddir)/nix/libstore \
-DNIX_STORE_DIR=\"$(storedir)\" \ -DNIX_STORE_DIR=\"$(storedir)\" \
-DNIX_DATA_DIR=\"$(datadir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ -DNIX_STATE_DIR=\"$(localstatedir)/guix\" \
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \ -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\" \
-DNIX_CONF_DIR=\"$(sysconfdir)/guix\" \ -DNIX_CONF_DIR=\"$(sysconfdir)/guix\" \
-DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
-DNIX_BIN_DIR=\"$(bindir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \

2
guix/config.scm.in
View File

@ -57,7 +57,7 @@
(define %state-directory (define %state-directory
;; This must match `NIX_STATE_DIR' as defined in `daemon.am'. ;; 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 (define %config-directory
;; This must match `NIX_CONF_DIR' as defined in `daemon.am'. ;; This must match `NIX_CONF_DIR' as defined in `daemon.am'.

2
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) (cond ((derivation-path? file)
(let* ((base (basename file)) (let* ((base (basename file))
(log (string-append (dirname %state-directory) ; XXX (log (string-append (dirname %state-directory) ; XXX
"/log/nix/drvs/" "/log/guix/drvs/"
(string-take base 2) "/" (string-take base 2) "/"
(string-drop base 2))) (string-drop base 2)))
(log.bz2 (string-append log ".bz2"))) (log.bz2 (string-append log ".bz2")))