nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-24 15:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
John Ericson 2023-03-11 17:29:06 -05:00
parent 69a6e650bf
commit 540704e0aa
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libmain/progress-bar.cc
View File

@ -586,16 +586,16 @@ public:
}
else if (type == resExpectBuild)
actInfo.buildsRemaining.insert(getS(fields, 0));
actInfo.buildsRemaining.insert(std::string { getS(fields, 0) });
else if (type == resUnexpectBuild)
actInfo.buildsRemaining.erase(getS(fields, 0));
actInfo.buildsRemaining.erase(std::string { getS(fields, 0) });
else if (type == resExpectSubstitution)
actInfo.substitutionsRemaining.insert(getS(fields, 0));
actInfo.substitutionsRemaining.insert(std::string { getS(fields, 0) });
else if (type == resUnexpectSubstitution)
actInfo.substitutionsRemaining.erase(getS(fields, 0));
actInfo.substitutionsRemaining.erase(std::string { getS(fields, 0) });
}
void update(State & state)
@ -815,7 +815,7 @@ public:
s += "\r\e[K";
if (msg) {
s += replaceStrings(*msg, "\n", "\r\n");
s += replaceStrings(std::string { *msg }, "\n", "\r\n");
s += ANSI_NORMAL "\e[K\n\r";
}

2
src/nix/main.cc
View File

@ -359,8 +359,6 @@ void mainWrapped(int argc, char * * argv)
setLogFormat(LogFormat::bar);
Finally f([] { logger->stop(); });
if (!args.command)
throw UsageError("no subcommand specified");