nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: Filter build-chroot-dirs entries that conflict with derivation outputs. 

Fixes https://github.com/NixOS/nixpkgs/issues/9504.

Note that this means we may have a non-functional /bin/sh in the
chroot while rebuilding Bash or one of its dependencies. Ideally those
packages don't rely on /bin/sh though.
This commit is contained in:
Eelco Dolstra 2015-09-02 14:54:12 +02:00 committed by Ludovic Courtès
parent 538684d0c4
commit 60c7c364f8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nix/libstore/build.cc
View File

@ -1870,13 +1870,13 @@ void DerivationGoal::startBuilder()
} }
} }
/* If we're repairing or checking, it's possible that we're /* If we're repairing, checking or rebuilding part of a
multiple-outputs derivation, it's possible that we're
rebuilding a path that is in settings.dirsInChroot rebuilding a path that is in settings.dirsInChroot
(typically the dependencies of /bin/sh). Throw them (typically the dependencies of /bin/sh). Throw them
out. */ out. */
if (buildMode != bmNormal) for (auto & i : drv.outputs)
foreach (DerivationOutputs::iterator, i, drv.outputs) dirsInChroot.erase(i.second.path);
dirsInChroot.erase(i->second.path);
#else #else
throw Error("chroot builds are not supported on this platform"); throw Error("chroot builds are not supported on this platform");