From 882d2376cff749d83ca36debca5172da1920c757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 7 May 2022 09:01:41 +0200
Subject: [PATCH] fixes for nixUnstable

---
 src/nix-eval-jobs.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nix-eval-jobs.cc b/src/nix-eval-jobs.cc
index 8ffd036..eb97d0b 100644
--- a/src/nix-eval-jobs.cc
+++ b/src/nix-eval-jobs.cc
@@ -287,14 +287,14 @@ static void worker(EvalState &state, Bindings &autoArgs, AutoCloseFD &to,
                     path.size() == 0; // Dont require `recurseForDerivations =
                                       // true;` for top-level attrset
 
-                for (auto &i : v->attrs->lexicographicOrder()) {
-                    std::string name(i->name);
+                for (auto &i : v->attrs->lexicographicOrder(state.symbols)) {
+                    const std::string &name = state.symbols[i->name];
                     attrs.push_back(name);
 
                     if (name == "recurseForDerivations") {
                         auto attrv =
                             v->attrs->get(state.sRecurseForDerivations);
-                        recurse = state.forceBool(*attrv->value, *attrv->pos);
+                        recurse = state.forceBool(*attrv->value, attrv->pos);
                     }
                 }
                 if (recurse)