NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-20 23:28:26 -04:00
Code Activity

more debug removal

Browse source
This commit is contained in:
Ben Burdette 2021-10-22 14:34:50 -06:00
parent e54f17eb46
commit 71da988d47
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libcmd/local.mk
View file

@ -10,6 +10,6 @@ libcmd_CXXFLAGS += -I src/libutil -I src/libstore -I src/libexpr -I src/libmain
libcmd_LDFLAGS = $(EDITLINE_LIBS) -llowdown libcmd_LDFLAGS = $(EDITLINE_LIBS) -llowdown
libcmd_LIBS = libstore libutil libexpr libmain libfetchers libnix libwut libcmd_LIBS = libstore libutil libexpr libmain libfetchers libnix
$(eval $(call install-file-in, $(d)/nix-cmd.pc, $(prefix)/lib/pkgconfig, 0644)) $(eval $(call install-file-in, $(d)/nix-cmd.pc, $(prefix)/lib/pkgconfig, 0644))

4
src/libexpr/eval.cc
View file

@ -406,7 +406,6 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
assert(gcInitialised); assert(gcInitialised);
// static_assert(sizeof(Env) <= 16 + sizeof(std::unique_ptr<void*>), "environment must be <= 16 bytes");
static_assert(sizeof(Env) <= 16, "environment must be <= 16 bytes"); static_assert(sizeof(Env) <= 16, "environment must be <= 16 bytes");
/* Initialise the Nix expression search path. */ /* Initialise the Nix expression search path. */
@ -1574,8 +1573,7 @@ void ExprWith::eval(EvalState & state, Env & env, Value & v)
env2.up = &env; env2.up = &env;
env2.prevWith = prevWith; env2.prevWith = prevWith;
env2.type = Env::HasWithExpr; env2.type = Env::HasWithExpr;
env2.values[0] = (Value *) attrs; // ok DAG nasty. just smoosh this in. env2.values[0] = (Value *) attrs;
// presumably evaluate later, lazily.
body->eval(state, env2, v); body->eval(state, env2, v);
} }