about summary refs log tree commit diff
path: root/src/libmain/shared.cc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-12-04T13·09+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-12-04T13·09+0000
commit1e16d2065503e213189d58db14de893f51545597 (patch)
tree746216248fb862e733c39b2213ef651f47c6d13e /src/libmain/shared.cc
parent9322b399f3a6fe3e0d60dfa991b06012c35b72f8 (diff)
* Install the worker in bindir, not libexecdir.
* Allow the worker path to be overriden through the NIX_WORKER
  environment variable.

Diffstat (limited to 'src/libmain/shared.cc')
-rw-r--r--src/libmain/shared.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 68016b0d7b7c..e6713e9abff0 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -91,6 +91,7 @@ static void initAndRun(int argc, char * * argv)
     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));
+    nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR));
 
     /* Get some settings from the configuration file. */
     thisSystem = querySetting("system", SYSTEM);