diff options
| -rw-r--r-- | src/libmain/shared.cc | 1 | ||||
| -rw-r--r-- | src/libstore/build.cc | 2 | ||||
| -rw-r--r-- | src/libstore/globals.cc | 1 | ||||
| -rw-r--r-- | src/libstore/globals.hh | 6 |
4 files changed, 1 insertions, 9 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index dee9a5320c..cfb34d7eb8 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -138,7 +138,6 @@ static void initAndRun(int argc, char * * argv) 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)); - nixChrootsDir = canonPath(getEnv("NIX_CHROOTS_DIR", nixStateDir + "/chroots")); string subs = getEnv("NIX_SUBSTITUTERS", "default"); if (subs == "default") { diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 466e3326d5..cbbd3aa394 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1657,7 +1657,7 @@ void DerivationGoal::startBuilder() #if CHROOT_ENABLED /* Create a temporary directory in which we set up the chroot environment using bind-mounts. */ - chrootRootDir = createTempDir(nixChrootsDir, "chroot-nix"); + chrootRootDir = createTempDir("", "nix-chroot"); /* Clean up the chroot directory automatically. */ autoDelChroot = boost::shared_ptr<AutoDelete>(new AutoDelete(chrootRootDir)); diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 27d75faec2..296cc4ac80 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -16,7 +16,6 @@ string nixDBPath = "/UNINIT"; string nixConfDir = "/UNINIT"; string nixLibexecDir = "/UNINIT"; string nixBinDir = "/UNINIT"; -string nixChrootsDir = "/UNINIT"; bool keepFailed = false; bool keepGoing = false; diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 7e973025c9..b8e2bae66e 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -35,12 +35,6 @@ extern string nixLibexecDir; /* nixBinDir is the directory where the main programs are stored. */ extern string nixBinDir; -/* nixChrootsDir is the directory where we create chroot environments - (when chroot builds are enabled). We don't put these under /tmp to - prevent "rm -rf /tmp" from recursing into /nix/store via the bind - mounts in the chroots. */ -extern string nixChrootsDir; - /* Misc. global flags. */ |