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

daemon: Remove unused 'NIX_DATA_DIR' environment variable. 

* nix/libstore/globals.hh (Settings)[nixDataDir]: Remove.
* nix/libstore/globals.cc (Settings:processEnvironment): Remove setting
of 'nixDataDir'.
* nix/local.mk (libstore_a_CPPFLAGS): Remove '-DNIX_DATA_DIR'.
This commit is contained in:
Ludovic Courtès 2019-02-03 22:30:18 +01:00
parent 765a5bf167
commit 65d13e3043
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nix/libstore/globals.cc
View File

@ -66,7 +66,6 @@ Settings::Settings()
void Settings::processEnvironment() void Settings::processEnvironment()
{ {
nixStore = canonPath(getEnv("NIX_STORE_DIR", getEnv("NIX_STORE", NIX_STORE_DIR))); nixStore = canonPath(getEnv("NIX_STORE_DIR", getEnv("NIX_STORE", NIX_STORE_DIR)));
nixDataDir = canonPath(getEnv("NIX_DATA_DIR", NIX_DATA_DIR));
nixLogDir = canonPath(getEnv("GUIX_LOG_DIRECTORY", NIX_LOG_DIR)); nixLogDir = canonPath(getEnv("GUIX_LOG_DIRECTORY", NIX_LOG_DIR));
nixStateDir = canonPath(getEnv("GUIX_STATE_DIRECTORY", NIX_STATE_DIR)); nixStateDir = canonPath(getEnv("GUIX_STATE_DIRECTORY", NIX_STATE_DIR));
nixDBPath = getEnv("GUIX_DATABASE_DIRECTORY", nixStateDir + "/db"); nixDBPath = getEnv("GUIX_DATABASE_DIRECTORY", nixStateDir + "/db");

2
nix/libstore/globals.hh
View File

@ -45,8 +45,6 @@ struct Settings {
/* The directory where we store sources and derived files. */ /* The directory where we store sources and derived files. */
Path nixStore; Path nixStore;
Path nixDataDir; /* !!! fix */
/* The directory where we log various operations. */ /* The directory where we log various operations. */
Path nixLogDir; Path nixLogDir;

3
nix/local.mk
View File

@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2012, 2013, 2014, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org> # Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
# #
# This file is part of GNU Guix. # This file is part of GNU Guix.
@ -107,7 +107,6 @@ libstore_a_CPPFLAGS = \
-I$(top_srcdir)/%D%/libstore \ -I$(top_srcdir)/%D%/libstore \
-I$(top_builddir)/%D%/libstore \ -I$(top_builddir)/%D%/libstore \
-DNIX_STORE_DIR=\"$(storedir)\" \ -DNIX_STORE_DIR=\"$(storedir)\" \
-DNIX_DATA_DIR=\"$(datadir)\" \
-DNIX_STATE_DIR=\"$(localstatedir)/guix\" \ -DNIX_STATE_DIR=\"$(localstatedir)/guix\" \
-DNIX_LOG_DIR=\"$(localstatedir)/log/guix\" \ -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\" \
-DGUIX_CONFIGURATION_DIRECTORY=\"$(sysconfdir)/guix\" \ -DGUIX_CONFIGURATION_DIRECTORY=\"$(sysconfdir)/guix\" \