guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/05: daemon: Remove unused 'NIX_DATA_DIR' environment variable.


From: guix-commits
Subject: 04/05: daemon: Remove unused 'NIX_DATA_DIR' environment variable.
Date: Sun, 3 Feb 2019 18:03:40 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 65d13e3043d90382f79b1780e06dc671ae451edf
Author: Ludovic Courtès <address@hidden>
Date:   Sun Feb 3 22:30:18 2019 +0100

    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/libstore/globals.cc | 1 -
 nix/libstore/globals.hh | 2 --
 nix/local.mk            | 3 +--
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc
index ac92971..130b093 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 a6935c3..b073f72 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 fe45c34..ca958ff 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 
<address@hidden>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès 
<address@hidden>
 # Copyright © 2016 Mathieu Lirzin <address@hidden>
 #
 # 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\"                \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]