lix-project/lix
20
55
Fork 31
Code Issues 346 Code Review (Gerrit) Projects 3 Releases Wiki Activity

nix profile install: Support installing non-flakes

Browse source 
Fixes #4458.
This commit is contained in:
Eelco Dolstra 2021-01-18 23:08:58 +01:00
parent 555940f065
commit bc90252cec
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/nix/profile.cc
View file

@ -252,8 +252,28 @@ struct CmdProfileInstall : InstallablesCommand, MixDefaultProfile
pathsToBuild.push_back({drv.drvPath, StringSet{"out"}}); // FIXME
manifest.elements.emplace_back(std::move(element));
} else
throw UnimplementedError("'nix profile install' does not support argument '%s'", installable->what());
} else {
auto buildables = build(store, Realise::Outputs, {installable}, bmNormal);
for (auto & buildable : buildables) {
ProfileElement element;
std::visit(overloaded {
[&](BuildableOpaque bo) {
pathsToBuild.push_back({bo.path, {}});
element.storePaths.insert(bo.path);
},
[&](BuildableFromDrv bfd) {
for (auto & output : store->queryDerivationOutputMap(bfd.drvPath)) {
pathsToBuild.push_back({bfd.drvPath, {output.first}});
element.storePaths.insert(output.second);
}
},
}, buildable);
manifest.elements.emplace_back(std::move(element));
}
}
}
store->buildPaths(pathsToBuild);