diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-07-20 13:21:37 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-07-20 13:21:37 +0000 |
| commit | a4273156c43db7325d27cb21e460b57a998ee882 (patch) | |
| tree | 5df69cee910afca2df45ceb26e5e16ba79b43dee /src/libstore | |
| parent | 410760c5ab696779bfd26bbd8026827ec436a201 (diff) | |
* Use $(libexecdir) to find find-runtime-roots.pl.
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/gc.cc | 2 | ||||
| -rw-r--r-- | src/libstore/globals.cc | 1 | ||||
| -rw-r--r-- | src/libstore/globals.hh | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index f25aabb3d..d646dd3de 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -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; diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index ac8e19b7d..f61fe167d 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -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; diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 408076b75..03aaa13d8 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -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. */ |