maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* 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
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/gc.cc
View file

@ -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;

1
src/libstore/globals.cc
View file

@ -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;

4
src/libstore/globals.hh
View file

@ -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. */