diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-02-03 22:30:18 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-02-04 00:03:30 +0100 |
| commit | 65d13e3043d90382f79b1780e06dc671ae451edf (patch) | |
| tree | ce76bd24b818f161366238fef0e4ae1c6e1cb119 | |
| parent | 765a5bf1677ad6bc77ed65df4f63da9ef77bb55a (diff) | |
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'.
| -rw-r--r-- | nix/libstore/globals.cc | 1 | ||||
| -rw-r--r-- | nix/libstore/globals.hh | 2 | ||||
| -rw-r--r-- | nix/local.mk | 3 |
3 files changed, 1 insertions, 5 deletions
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc index ac92971887..130b0937fd 100644 --- a/nix/libstore/globals.cc +++ b/nix/libstore/globals.cc @@ -66,7 +66,6 @@ Settings::Settings() void Settings::processEnvironment() { 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)); nixStateDir = canonPath(getEnv("GUIX_STATE_DIRECTORY", NIX_STATE_DIR)); nixDBPath = getEnv("GUIX_DATABASE_DIRECTORY", nixStateDir + "/db"); diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh index a6935c3337..b073f724b6 100644 --- a/nix/libstore/globals.hh +++ b/nix/libstore/globals.hh @@ -45,8 +45,6 @@ struct Settings { /* The directory where we store sources and derived files. */ Path nixStore; - Path nixDataDir; /* !!! fix */ - /* The directory where we log various operations. */ Path nixLogDir; diff --git a/nix/local.mk b/nix/local.mk index fe45c344f0..ca958ff500 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -1,5 +1,5 @@ # 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> # # This file is part of GNU Guix. @@ -107,7 +107,6 @@ libstore_a_CPPFLAGS = \ -I$(top_srcdir)/%D%/libstore \ -I$(top_builddir)/%D%/libstore \ -DNIX_STORE_DIR=\"$(storedir)\" \ - -DNIX_DATA_DIR=\"$(datadir)\" \ -DNIX_STATE_DIR=\"$(localstatedir)/guix\" \ -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\" \ -DGUIX_CONFIGURATION_DIRECTORY=\"$(sysconfdir)/guix\" \ |