3 files changed, 6 insertions, 1 deletions
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index f25aabb3dce8..d646dd3dec28 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 ac8e19b7d46b..f61fe167d870 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 408076b751e7..03aaa13d8917 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. */