* Use $(libexecdir) to find find-runtime-roots.pl.
This commit is contained in:
parent
410760c5ab
commit
a4273156c4
|
@ -8,6 +8,7 @@ AM_CXXFLAGS = \
|
|||
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
|
||||
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
|
||||
-DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \
|
||||
-DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
|
||||
-DNIX_VERSION=\"$(VERSION)\" \
|
||||
-I$(srcdir)/.. ${aterm_include} -I$(srcdir)/../libutil \
|
||||
-I$(srcdir)/../libstore
|
||||
|
|
|
@ -92,6 +92,7 @@ static void initAndRun(int argc, char * * argv)
|
|||
nixStateDir = canonPath(getEnv("NIX_STATE_DIR", NIX_STATE_DIR));
|
||||
nixDBPath = getEnv("NIX_DB_DIR", nixStateDir + "/db");
|
||||
nixConfDir = canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR));
|
||||
nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR));
|
||||
|
||||
thisSystem = querySetting("system", SYSTEM);
|
||||
|
||||
|
|
|
@ -319,7 +319,7 @@ static void findRoots(const Path & path, bool recurseSymlinks,
|
|||
static void addAdditionalRoots(PathSet & roots)
|
||||
{
|
||||
Path rootFinder = getEnv("NIX_ROOT_FINDER",
|
||||
"/nix/libexec/nix/find-runtime-roots.pl"); /* !!! */
|
||||
nixLibexecDir + "/nix/find-runtime-roots.pl");
|
||||
|
||||
if (rootFinder.empty()) return;
|
||||
|
||||
|
|
|
@ -10,6 +10,7 @@ string nixLogDir = "/UNINIT";
|
|||
string nixStateDir = "/UNINIT";
|
||||
string nixDBPath = "/UNINIT";
|
||||
string nixConfDir = "/UNINIT";
|
||||
string nixLibexecDir = "/UNINIT";
|
||||
|
||||
bool keepFailed = false;
|
||||
bool keepGoing = false;
|
||||
|
|
|
@ -28,6 +28,10 @@ extern string nixDBPath;
|
|||
stored. */
|
||||
extern string nixConfDir;
|
||||
|
||||
/* nixLibexecDir is the directory where internal helper programs are
|
||||
stored. */
|
||||
extern string nixLibexecDir;
|
||||
|
||||
|
||||
|
||||
/* Misc. global flags. */
|
||||
|
|
Loading…
Reference in a new issue