about summary refs log tree commit diff
path: root/third_party/nix/src/nix-env
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/nix/src/nix-env')
-rw-r--r--third_party/nix/src/nix-env/nix-env.cc5
-rw-r--r--third_party/nix/src/nix-env/user-env.cc4
2 files changed, 4 insertions, 5 deletions
diff --git a/third_party/nix/src/nix-env/nix-env.cc b/third_party/nix/src/nix-env/nix-env.cc
index 93a8e4c1ecdb..a645fa31489c 100644
--- a/third_party/nix/src/nix-env/nix-env.cc
+++ b/third_party/nix/src/nix-env/nix-env.cc
@@ -1209,13 +1209,12 @@ static void opQuery(Globals& globals, Strings opFlags, Strings opArgs) {
                   attrs2["type"] = "strings";
                   XMLOpenElement m(xml, "meta", attrs2);
                   Bindings& attrs = *v->attrs;
-                  for (auto& i : attrs) {
-                    Attr& a(*attrs.find(i.name));
+                  for (auto& [name, a] : attrs) {
                     if (a.value->type != tString) {
                       continue;
                     }
                     XMLAttrs attrs3;
-                    attrs3["type"] = i.name;
+                    attrs3["type"] = name;
                     attrs3["value"] = a.value->string.s;
                     xml.writeEmptyElement("string", attrs3);
                   }
diff --git a/third_party/nix/src/nix-env/user-env.cc b/third_party/nix/src/nix-env/user-env.cc
index adff263ff4cd..21e7d42e8845 100644
--- a/third_party/nix/src/nix-env/user-env.cc
+++ b/third_party/nix/src/nix-env/user-env.cc
@@ -129,11 +129,11 @@ bool createUserEnv(EvalState& state, DrvInfos& elems, const Path& profile,
   DLOG(INFO) << "evaluating user environment builder";
   state.forceValue(topLevel);
   PathSet context;
-  Attr& aDrvPath(*topLevel.attrs->find(state.sDrvPath));
+  Attr& aDrvPath(topLevel.attrs->find(state.sDrvPath)->second);
   Path topLevelDrv =
       state.coerceToPath(aDrvPath.pos != nullptr ? *(aDrvPath.pos) : noPos,
                          *(aDrvPath.value), context);
-  Attr& aOutPath(*topLevel.attrs->find(state.sOutPath));
+  Attr& aOutPath(topLevel.attrs->find(state.sOutPath)->second);
   Path topLevelOut =
       state.coerceToPath(aOutPath.pos != nullptr ? *(aOutPath.pos) : noPos,
                          *(aOutPath.value), context);