diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-02-03 22:10:06 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-02-04 00:03:30 +0100 |
| commit | a87d66f371da2a84d7bba1cae58b71c9c9af73aa (patch) | |
| tree | b76d7573152a73dad1c51ac6d41538fe3a40ff66 /build-aux/build-self.scm | |
| parent | f73ab814a54033e12f2fe71bff672198210bb8c2 (diff) | |
| download | guix-a87d66f371da2a84d7bba1cae58b71c9c9af73aa.tar.gz | |
daemon: Rename 'NIX_STATE_DIR' and 'NIX_DB_DIR' environment variables.
Fixes <https://bugs.gnu.org/22459>.
Reported by Jeff Mickey <j@codemac.net>.
* guix/config.scm.in (%state-directory): Change NIX_STATE_DIR to
GUIX_STATE_DIRECTORY.
(%store-database-directory): Change NIX_DB_DIR to
GUIX_DATABASE_DIRECTORY.
* nix/libstore/globals.cc (Settings::processEnvironment): Likewise.
* guix/self.scm (make-config.scm): Likewise.
* build-aux/build-self.scm (make-config.scm): Likewise.
* build-aux/test-env.in: Likewise.
* tests/derivations.scm ("derivation #:leaked-env-vars"): Likewise.
* tests/guix-build.sh (GUIX_DAEMON_SOCKET): Likewise.
* tests/guix-daemon.sh (socket): Likewise.
Diffstat (limited to 'build-aux/build-self.scm')
| -rw-r--r-- | build-aux/build-self.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index f70c3d91ff..d18b4504cf 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -114,11 +114,11 @@ (define %state-directory ;; This must match `NIX_STATE_DIR' as defined in ;; `nix/local.mk'. - (or (getenv "NIX_STATE_DIR") + (or (getenv "GUIX_STATE_DIRECTORY") (string-append %localstatedir "/guix"))) (define %store-database-directory - (or (getenv "NIX_DB_DIR") + (or (getenv "GUIX_DATABASE_DIRECTORY") (string-append %state-directory "/db"))) (define %config-directory |