diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-21T03·56+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-21T04·09+0100 |
commit | c395a48be2ad58560590897e11793db032873ed6 (patch) | |
tree | 11cc692b442c10db9f1a6055cfe68bc534e6f494 /third_party/nix/src/nix-env/nix-env.cc | |
parent | 97e85f94e5ee7e6c8340011757a71222b8091cda (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/nix-env.cc')
-rw-r--r-- | third_party/nix/src/nix-env/nix-env.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/nix/src/nix-env/nix-env.cc b/third_party/nix/src/nix-env/nix-env.cc index 95a395a96fcc..93a8e4c1ecdb 100644 --- a/third_party/nix/src/nix-env/nix-env.cc +++ b/third_party/nix/src/nix-env/nix-env.cc @@ -132,7 +132,7 @@ static void getAllExprs(EvalState& state, const Path& path, StringSet& attrs, throw Error(format("too many Nix expressions in directory '%1%'") % path); } - mkApp(*state.allocAttr(v, state.symbols.create(attrName)), vFun, vArg); + mkApp(*state.allocAttr(v, state.symbols.Create(attrName)), vFun, vArg); } else if (S_ISDIR(st.st_mode)) { /* `path2' is a directory (with no default.nix in it); recurse into it. */ @@ -159,7 +159,7 @@ static void loadSourceExpr(EvalState& state, const Path& path, Value& v) { directory). */ else if (S_ISDIR(st.st_mode)) { state.mkAttrs(v, 1024); - state.mkList(*state.allocAttr(v, state.symbols.create("_combineChannels")), + state.mkList(*state.allocAttr(v, state.symbols.Create("_combineChannels")), 0); StringSet attrs; getAllExprs(state, path, attrs, v); |