wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Add option ‘build-extra-chroot-dirs’

Browse source 
This is useful for extending (rather than overriding) the default set
of chroot paths.
This commit is contained in:
Eelco Dolstra 2014-08-04 18:00:00 +02:00
parent 4d73e2e893
commit d5a076c36f
5 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libstore/build.cc
View file

@ -1792,12 +1792,15 @@ void DerivationGoal::startBuilder()
/* Bind-mount a user-configurable set of directories from the
host file system. */
foreach (StringSet::iterator, i, settings.dirsInChroot) {
size_t p = i->find('=');
PathSet dirs = tokenizeString<StringSet>(settings.get(string("build-chroot-dirs"), DEFAULT_CHROOT_DIRS));
PathSet dirs2 = tokenizeString<StringSet>(settings.get(string("build-extra-chroot-dirs"), ""));
dirs.insert(dirs2.begin(), dirs2.end());
for (auto & i : dirs) {
size_t p = i.find('=');
if (p == string::npos)
dirsInChroot[*i] = *i;
dirsInChroot[i] = i;
else
dirsInChroot[string(*i, 0, p)] = string(*i, p + 1);
dirsInChroot[string(i, 0, p)] = string(i, p + 1);
}
dirsInChroot[tmpDir] = tmpDir;