lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Use $(libexecdir) to find find-runtime-roots.pl.

Browse source
This commit is contained in:
Eelco Dolstra 2006-07-20 13:21:37 +00:00
parent 410760c5ab
commit a4273156c4
5 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libmain/Makefile.am
View file

@ -8,6 +8,7 @@ AM_CXXFLAGS = \
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \ -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
-DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \ -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \
-DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
-DNIX_VERSION=\"$(VERSION)\" \ -DNIX_VERSION=\"$(VERSION)\" \
-I$(srcdir)/.. ${aterm_include} -I$(srcdir)/../libutil \ -I$(srcdir)/.. ${aterm_include} -I$(srcdir)/../libutil \
-I$(srcdir)/../libstore -I$(srcdir)/../libstore

1
src/libmain/shared.cc
View file

@ -92,6 +92,7 @@ static void initAndRun(int argc, char * * argv)
nixStateDir = canonPath(getEnv("NIX_STATE_DIR", NIX_STATE_DIR)); nixStateDir = canonPath(getEnv("NIX_STATE_DIR", NIX_STATE_DIR));
nixDBPath = getEnv("NIX_DB_DIR", nixStateDir + "/db"); nixDBPath = getEnv("NIX_DB_DIR", nixStateDir + "/db");
nixConfDir = canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR)); nixConfDir = canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR));
nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR));
thisSystem = querySetting("system", SYSTEM); thisSystem = querySetting("system", SYSTEM);

2
src/libstore/gc.cc
View file

@ -319,7 +319,7 @@ static void findRoots(const Path & path, bool recurseSymlinks,
static void addAdditionalRoots(PathSet & roots) static void addAdditionalRoots(PathSet & roots)
{ {
Path rootFinder = getEnv("NIX_ROOT_FINDER", Path rootFinder = getEnv("NIX_ROOT_FINDER",
"/nix/libexec/nix/find-runtime-roots.pl"); /* !!! */ nixLibexecDir + "/nix/find-runtime-roots.pl");
if (rootFinder.empty()) return; if (rootFinder.empty()) return;

1
src/libstore/globals.cc
View file

@ -10,6 +10,7 @@ string nixLogDir = "/UNINIT";
string nixStateDir = "/UNINIT"; string nixStateDir = "/UNINIT";
string nixDBPath = "/UNINIT"; string nixDBPath = "/UNINIT";
string nixConfDir = "/UNINIT"; string nixConfDir = "/UNINIT";
string nixLibexecDir = "/UNINIT";
bool keepFailed = false; bool keepFailed = false;
bool keepGoing = false; bool keepGoing = false;

4
src/libstore/globals.hh
View file

@ -28,6 +28,10 @@ extern string nixDBPath;
stored. */ stored. */
extern string nixConfDir; extern string nixConfDir;
/* nixLibexecDir is the directory where internal helper programs are
stored. */
extern string nixLibexecDir;
/* Misc. global flags. */ /* Misc. global flags. */