nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-03 15:40:59 +01:00
Code Activity

* Install the worker in bindir, not libexecdir.

Browse source 
* Allow the worker path to be overriden through the NIX_WORKER
  environment variable.
This commit is contained in:
Eelco Dolstra 2006-12-04 13:09:16 +00:00
parent 9322b399f3
commit 1e16d20655
6 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libmain/Makefile.am
View file

@ -9,6 +9,7 @@ AM_CXXFLAGS = \
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
-DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \
-DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
-DNIX_BIN_DIR=\"$(bindir)\" \
-DNIX_VERSION=\"$(VERSION)\" \
-I$(srcdir)/.. ${aterm_include} -I$(srcdir)/../libutil \
-I$(srcdir)/../libstore

1
src/libmain/shared.cc
View file

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