diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-03 15:43:17 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-03 15:43:17 +0000 |
| commit | e7d93e7ece8fd6906e45d0ea21fa08e00b815ca8 (patch) | |
| tree | cab29687872b29cec9306d04dafbee4e1ee7cf95 /src/nix/build.cc | |
| parent | ef278d00f92cddba48a463a38107276b029dd66b (diff) | |
| parent | 8a945d6ddb0676b454458e6fe0e9ea6f8b4b5659 (diff) | |
Merge remote-tracking branch 'upstream/master' into single-ca-drv-build
Diffstat (limited to 'src/nix/build.cc')
| -rw-r--r-- | src/nix/build.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/build.cc b/src/nix/build.cc index cb12ee933..4605eb13e 100644 --- a/src/nix/build.cc +++ b/src/nix/build.cc @@ -71,7 +71,7 @@ struct CmdBuild : InstallablesCommand, MixDryRun, MixProfile [&](BuildableOpaque bo) { std::string symlink = outLink; if (i) symlink += fmt("-%d", i); - store2->addPermRoot(bo.path, absPath(symlink), true); + store2->addPermRoot(bo.path, absPath(symlink)); }, [&](BuildableFromDrv bfd) { auto builtOutputs = store->queryDerivationOutputMap(bfd.drvPath); @@ -79,7 +79,7 @@ struct CmdBuild : InstallablesCommand, MixDryRun, MixProfile std::string symlink = outLink; if (i) symlink += fmt("-%d", i); if (output.first != "out") symlink += fmt("-%s", output.first); - store2->addPermRoot(output.second, absPath(symlink), true); + store2->addPermRoot(output.second, absPath(symlink)); } }, }, buildables[i]); |