From 80d0447c9556f06decc80a2d43c2fa8402406d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 8 Jan 2014 21:12:55 +0100 Subject: 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. --- guix/config.scm.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guix/config.scm.in') diff --git a/guix/config.scm.in b/guix/config.scm.in index 4835c6e5d9..0833faef40 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,7 +55,7 @@ (define %state-directory ;; 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 ;; This must match `NIX_CONF_DIR' as defined in `daemon.am'. -- cgit v1.2.3