max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2025-02-16 15:17:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcmd/modify-installables: build overrideValues differently

Browse source
This commit is contained in:
Max Headroom 2024-04-19 17:45:47 +02:00
parent 1e28a13720
commit 05d4a86923
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libcmd/modify-installables.cc
View file

@ -45,10 +45,11 @@ ref<Installable> SourceExprCommand::modifyInstallable (
state->callFunction(*vApply, *v, *vRes, noPos); state->callFunction(*vApply, *v, *vRes, noPos);
} else if (overrideSet->size() > 0) { } else if (overrideSet->size() > 0) {
Value * overrideValues = state->allocValue(); Value * overrideValues = state->allocValue();
overrideValues->mkAttrs(state->buildBindings(overrideSet->size()).finish()); auto overrideBinds = state->buildBindings(overrideSet->size());
for (auto& v : *overrideSet) { for (auto& v : *overrideSet) {
overrideValues->attrs()->push_back(v); overrideBinds.insert(v);
} }
overrideValues->mkAttrs(overrideBinds.finish());
auto vOverrideFunctorAttr = v->attrs()->get(state->symbols.create("override")); auto vOverrideFunctorAttr = v->attrs()->get(state->symbols.create("override"));
if (!vOverrideFunctorAttr) { if (!vOverrideFunctorAttr) {
throw Error("%s is not overridable", installableName); throw Error("%s is not overridable", installableName);