wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity

Rename Buildable

Browse source
This commit is contained in:
John Ericson 2021-04-05 09:48:18 -04:00
parent 9dfb97c987
commit 9b805d36ac
35 changed files with 165 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/nix-env/nix-env.cc
View file

@ -419,13 +419,13 @@ static void queryInstSources(EvalState & state,
static void printMissing(EvalState & state, DrvInfos & elems)
{
std::vector<BuildableReq> targets;
std::vector<DerivedPath> targets;
for (auto & i : elems) {
Path drvPath = i.queryDrvPath();
if (drvPath != "")
targets.push_back(BuildableReqFromDrv{state.store->parseStorePath(drvPath)});
targets.push_back(DerivedPath::Built{state.store->parseStorePath(drvPath)});
else
targets.push_back(BuildableOpaque{state.store->parseStorePath(i.queryOutPath())});
targets.push_back(DerivedPath::Opaque{state.store->parseStorePath(i.queryOutPath())});
}
printMissing(state.store, targets);
@ -694,12 +694,12 @@ static void opSet(Globals & globals, Strings opFlags, Strings opArgs)
if (globals.forceName != "")
drv.setName(globals.forceName);
std::vector<BuildableReq> paths {
std::vector<DerivedPath> paths {
(drv.queryDrvPath() != "")
? (BuildableReq) (BuildableReqFromDrv {
? (DerivedPath) (DerivedPath::Built {
globals.state->store->parseStorePath(drv.queryDrvPath())
})
: (BuildableReq) (BuildableOpaque {
: (DerivedPath) (DerivedPath::Opaque {
globals.state->store->parseStorePath(drv.queryOutPath())
}),
};