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

nix: Remove special handling of .drv files

Browse source 
This makes 'nix copy' and 'nix path-info' work on .drv store
paths. Removing special treatment of .drv files seems the most
future-proof approach given the possible removal of .drv files in the
future.

Note that 'nix build' will still build (rather than substitute) .drv
paths due to the unfortunate overloading in Store::buildPaths().
This commit is contained in:
Eelco Dolstra 2018-06-13 18:04:22 +02:00
parent 7902fccf6f
commit 85530bcc0b
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/nix/installables.cc
View file

@ -86,22 +86,6 @@ Buildable Installable::toBuildable()
return std::move(buildables[0]); return std::move(buildables[0]);
} }
struct InstallableStoreDrv : Installable
{
Path drvPath;
InstallableStoreDrv(const Path & drvPath) : drvPath(drvPath) { }
std::string what() override { return drvPath; }
Buildables toBuildables() override
{
Buildable b = {drvPath};
// FIXME: add outputs?
return {b};
}
};
struct InstallableStorePath : Installable struct InstallableStorePath : Installable
{ {
Path storePath; Path storePath;
@ -226,13 +210,9 @@ static std::vector<std::shared_ptr<Installable>> parseInstallables(
auto path = store->toStorePath(store->followLinksToStore(s)); auto path = store->toStorePath(store->followLinksToStore(s));
if (store->isStorePath(path)) { if (store->isStorePath(path))
if (isDerivation(path))
result.push_back(std::make_shared<InstallableStoreDrv>(path));
else
result.push_back(std::make_shared<InstallableStorePath>(path)); result.push_back(std::make_shared<InstallableStorePath>(path));
} }
}
else if (s == "" || std::regex_match(s, attrPathRegex)) else if (s == "" || std::regex_match(s, attrPathRegex))
result.push_back(std::make_shared<InstallableAttrPath>(cmd, s)); result.push_back(std::make_shared<InstallableAttrPath>(cmd, s));