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

config: '%state-directory' always honors $NIX_STATE_DIR. 

* guix/config.scm.in (%state-directory): Honor $NIX_STATE_DIR.
* guix/scripts/package.scm (%profile-directory): Use %state-directory
  directly.
* guix/store.scm (%default-socket-path, log-file): Likewise.
This commit is contained in:
Ludovic Courtès 2014-01-08 21:12:55 +01:00
parent 021a201f29
commit 80d0447c95
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/config.scm.in
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -55,7 +55,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'.
"@guix_localstatedir@/nix") (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/nix"))
(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/scripts/package.scm
View File

@ -57,7 +57,7 @@
(cut string-append <> "/.guix-profile"))) (cut string-append <> "/.guix-profile")))
(define %profile-directory (define %profile-directory
(string-append (or (getenv "NIX_STATE_DIR") %state-directory) "/profiles/" (string-append %state-directory "/profiles/"
(or (and=> (getenv "USER") (or (and=> (getenv "USER")
(cut string-append "per-user/" <>)) (cut string-append "per-user/" <>))
"default"))) "default")))

8
guix/store.scm
View File

@ -158,8 +158,7 @@
(delete-specific 3)) (delete-specific 3))
(define %default-socket-path (define %default-socket-path
(string-append (or (getenv "NIX_STATE_DIR") %state-directory) (string-append %state-directory "/daemon-socket/socket"))
"/daemon-socket/socket"))
(define %daemon-socket-file (define %daemon-socket-file
;; File name of the socket the daemon listens too. ;; File name of the socket the daemon listens too.
@ -749,12 +748,9 @@ syntactically valid store path."
(define (log-file store file) (define (log-file store file)
"Return the build log file for FILE, or #f if none could be found. FILE "Return the build log file for FILE, or #f if none could be found. FILE
must be an absolute store file name, or a derivation file name." must be an absolute store file name, or a derivation file name."
(define state-dir ; XXX: factorize
(or (getenv "NIX_STATE_DIR") %state-directory))
(cond ((derivation-path? file) (cond ((derivation-path? file)
(let* ((base (basename file)) (let* ((base (basename file))
(log (string-append (dirname state-dir) ; XXX: ditto (log (string-append (dirname %state-directory) ; XXX
"/log/nix/drvs/" "/log/nix/drvs/"
(string-take base 2) "/" (string-take base 2) "/"
(string-drop base 2))) (string-drop base 2)))