From 65d13e3043d90382f79b1780e06dc671ae451edf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 3 Feb 2019 22:30:18 +0100 Subject: 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'. --- nix/local.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nix/local.mk') 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 +# Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès # Copyright © 2016 Mathieu Lirzin # # 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\" \ -- cgit v1.2.3