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

Set default installable

Browse source 
Thus

  $ nix build -f foo.nix

will build foo.nix.

And

  $ nix build

will build default.nix. However, this may not be a good idea because
it's kind of inconsistent, given that "nix build foo" will build the
"foo" attribute from the default installation source (i.e. the
synthesis of $NIX_PATH), rather than ./default.nix. So I may revert
this.
This commit is contained in:
Eelco Dolstra 2017-04-25 15:18:05 +02:00
parent 0b6220fbd6
commit d48c973ece
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nix/installables.cc
View file

@ -181,6 +181,12 @@ std::vector<std::shared_ptr<Installable>> InstallablesCommand::parseInstallables
{ {
std::vector<std::shared_ptr<Installable>> result; std::vector<std::shared_ptr<Installable>> result;
if (installables.empty()) {
if (file == "")
file = ".";
installables = Strings{""};
}
for (auto & installable : installables) { for (auto & installable : installables) {
if (installable.find("/") != std::string::npos) { if (installable.find("/") != std::string::npos) {
@ -198,7 +204,7 @@ std::vector<std::shared_ptr<Installable>> InstallablesCommand::parseInstallables
else if (installable.compare(0, 1, "(") == 0) else if (installable.compare(0, 1, "(") == 0)
result.push_back(std::make_shared<InstallableExpr>(*this, installable)); result.push_back(std::make_shared<InstallableExpr>(*this, installable));
else if (std::regex_match(installable, attrPathRegex)) else if (installable == "" || std::regex_match(installable, attrPathRegex))
result.push_back(std::make_shared<InstallableAttrPath>(*this, installable)); result.push_back(std::make_shared<InstallableAttrPath>(*this, installable));
else else