diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-05-12 19:13:33 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-05-12 19:13:33 +0000 |
| commit | b18720ee175d6c019be964955efc1633be1c434d (patch) | |
| tree | da1daaed8a0c3c45829ba9285f328d31e09476b8 /src/resolve-system-dependencies/resolve-system-dependencies.cc | |
| parent | 6b61d7722d0b24bc4b5e020a71ada442c19f495d (diff) | |
| parent | d354fc30b9768ea3dc737a88b57bf5e26d98135b (diff) | |
Merge remote-tracking branch 'upstream/master' into indexed-store-path-outputs
Diffstat (limited to 'src/resolve-system-dependencies/resolve-system-dependencies.cc')
| -rw-r--r-- | src/resolve-system-dependencies/resolve-system-dependencies.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resolve-system-dependencies/resolve-system-dependencies.cc b/src/resolve-system-dependencies/resolve-system-dependencies.cc index 4dd691981..c6023eb03 100644 --- a/src/resolve-system-dependencies/resolve-system-dependencies.cc +++ b/src/resolve-system-dependencies/resolve-system-dependencies.cc @@ -176,7 +176,7 @@ int main(int argc, char ** argv) impurePaths.insert(argv[2]); else { auto drv = store->derivationFromPath(store->parseStorePath(argv[1])); - impurePaths = tokenizeString<StringSet>(get(drv.env, "__impureHostDeps").value_or("")); + impurePaths = tokenizeString<StringSet>(getOr(drv.env, "__impureHostDeps", "")); impurePaths.insert("/usr/lib/libSystem.dylib"); } |