maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix build: Add --out-link and --no-link options

Browse source
This commit is contained in:
Eelco Dolstra 2017-09-06 16:20:34 +02:00
parent df4342bc17
commit dff440aab3
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 37 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/nix/build.cc
View file

@ -7,8 +7,22 @@ using namespace nix;
struct CmdBuild : MixDryRun, InstallablesCommand
{
Path outLink = "result";
CmdBuild()
{
mkFlag()
.longName("out-link")
.shortName('o')
.description("path of the symlink to the build result")
.arity(1)
.labels({"path"})
.dest(&outLink);
mkFlag()
.longName("no-link")
.description("do not create a symlink to the build result")
.set(&outLink, Path(""));
}
std::string name() override
@ -28,14 +42,14 @@ struct CmdBuild : MixDryRun, InstallablesCommand
for (size_t i = 0; i < buildables.size(); ++i) {
auto & b(buildables[i]);
for (auto & output : b.outputs) {
if (auto store2 = store.dynamic_pointer_cast<LocalFSStore>()) {
std::string symlink = "result";
if (i) symlink += fmt("-%d", i);
if (output.first != "out") symlink += fmt("-%s", output.first);
store2->addPermRoot(output.second, absPath(symlink), true);
}
}
if (outLink != "")
for (auto & output : b.outputs)
if (auto store2 = store.dynamic_pointer_cast<LocalFSStore>()) {
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);
}
}
}
};