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 /nix/local.mk | |
| parent | 765a5bf1677ad6bc77ed65df4f63da9ef77bb55a (diff) | |
| download | gnu-guix-65d13e3043d90382f79b1780e06dc671ae451edf.tar gnu-guix-65d13e3043d90382f79b1780e06dc671ae451edf.tar.gz | |
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'.
Diffstat (limited to 'nix/local.mk')
| -rw-r--r-- | nix/local.mk | 3 |
1 files changed, 1 insertions, 2 deletions
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\" \ |