lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Mark __impureHostDeps paths as optional

Browse source 
Starting in macOS 11, the on-disk dylib bundles are no longer available,
but nixpkgs needs to be able to keep compatibility with older versions
that require `/usr/lib/libSystem.B.dylib` in `__impureHostDeps`. Allow
it to keep backwards compatibility with these versions by marking these
dependencies as optional.

Fixes #4658.
This commit is contained in:
Emily 2021-05-02 05:30:50 +01:00
parent d15a1962cb
commit c4355a52fa
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/build/local-derivation-goal.cc
View file

@ -581,7 +581,9 @@ void LocalDerivationGoal::startBuilder()
throw Error("derivation '%s' requested impure path '%s', but it was not in allowed-impure-host-deps", throw Error("derivation '%s' requested impure path '%s', but it was not in allowed-impure-host-deps",
worker.store.printStorePath(drvPath), i); 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__ #if __linux__