diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-05-03 16:13:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 16:13:36 +0200 |
| commit | 40378fbcba6595e195878f96a8e198325512fc1e (patch) | |
| tree | c7f1c1d8d853fb2cd8bebe43eecd6269a4de2f27 | |
| parent | 6d2553ae1496288554e871c530836428f405fd67 (diff) | |
| parent | c4355a52fa317cb782fec5e22c4ac688f67d487d (diff) | |
Merge pull request #4761 from emilazy/issue-4658-mark-impure-host-deps-as-optional
Mark `__impureHostDeps` paths as optional
| -rw-r--r-- | src/libstore/build/local-derivation-goal.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc index 7c1402918..4a67b3f47 100644 --- a/src/libstore/build/local-derivation-goal.cc +++ b/src/libstore/build/local-derivation-goal.cc @@ -581,7 +581,9 @@ void LocalDerivationGoal::startBuilder() throw Error("derivation '%s' requested impure path '%s', but it was not in allowed-impure-host-deps", worker.store.printStorePath(drvPath), i); - dirsInChroot[i] = i; + /* Allow files in __impureHostDeps to be missing; e.g. + macOS 11+ has no /usr/lib/libSystem*.dylib */ + dirsInChroot[i] = {i, true}; } #if __linux__ |