about summary refs log tree commit diff
path: root/third_party/nix/src/nix-env/user-env.cc
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-21T03·56+0100
committerVincent Ambo <tazjin@google.com>2020-05-21T04·09+0100
commitc395a48be2ad58560590897e11793db032873ed6 (patch)
tree11cc692b442c10db9f1a6055cfe68bc534e6f494 /third_party/nix/src/nix-env/user-env.cc
parent97e85f94e5ee7e6c8340011757a71222b8091cda (diff)
fix(3p/nix): Compatibility with updated SymbolTable r/795
The functions in SymbolTable have been renamed to match the Google
Style guide, and some debug-only functions have been removed.
Diffstat (limited to 'third_party/nix/src/nix-env/user-env.cc')
-rw-r--r--third_party/nix/src/nix-env/user-env.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/third_party/nix/src/nix-env/user-env.cc b/third_party/nix/src/nix-env/user-env.cc
index bf15543c3f95..adff263ff4cd 100644
--- a/third_party/nix/src/nix-env/user-env.cc
+++ b/third_party/nix/src/nix-env/user-env.cc
@@ -73,7 +73,7 @@ bool createUserEnv(EvalState& state, DrvInfos& elems, const Path& profile,
     unsigned int m = 0;
     for (auto& j : outputs) {
       mkString(*(vOutputs.listElems()[m++] = state.allocValue()), j.first);
-      Value& vOutputs = *state.allocAttr(v, state.symbols.create(j.first));
+      Value& vOutputs = *state.allocAttr(v, state.symbols.Create(j.first));
       state.mkAttrs(vOutputs, 2);
       mkString(*state.allocAttr(vOutputs, state.sOutPath), j.second);
 
@@ -94,7 +94,7 @@ bool createUserEnv(EvalState& state, DrvInfos& elems, const Path& profile,
       if (v == nullptr) {
         continue;
       }
-      vMeta.attrs->push_back(Attr(state.symbols.create(j), v));
+      vMeta.attrs->push_back(Attr(state.symbols.Create(j), v));
     }
     vMeta.attrs->sort();
     v.attrs->sort();
@@ -119,9 +119,9 @@ bool createUserEnv(EvalState& state, DrvInfos& elems, const Path& profile,
   Value args;
   Value topLevel;
   state.mkAttrs(args, 3);
-  mkString(*state.allocAttr(args, state.symbols.create("manifest")),
+  mkString(*state.allocAttr(args, state.symbols.Create("manifest")),
            manifestFile, {manifestFile});
-  args.attrs->push_back(Attr(state.symbols.create("derivations"), &manifest));
+  args.attrs->push_back(Attr(state.symbols.Create("derivations"), &manifest));
   args.attrs->sort();
   mkApp(topLevel, envBuilder, args);