From 71da988d47433543e70cd52dbdd6c907dd3cabda Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Fri, 22 Oct 2021 14:34:50 -0600
Subject: [PATCH] more debug removal

---
 src/libcmd/local.mk | 2 +-
 src/libexpr/eval.cc | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libcmd/local.mk b/src/libcmd/local.mk
index c282499b1..df904612b 100644
--- a/src/libcmd/local.mk
+++ b/src/libcmd/local.mk
@@ -10,6 +10,6 @@ libcmd_CXXFLAGS += -I src/libutil -I src/libstore -I src/libexpr -I src/libmain
 
 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))
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 73609c3d2..719dcc1b4 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -406,7 +406,6 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
 
     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");
 
     /* Initialise the Nix expression search path. */
@@ -1574,8 +1573,7 @@ void ExprWith::eval(EvalState & state, Env & env, Value & v)
     env2.up = &env;
     env2.prevWith = prevWith;
     env2.type = Env::HasWithExpr;
-    env2.values[0] = (Value *) attrs;  // ok DAG nasty.  just smoosh this in.
-        // presumably evaluate later, lazily.
+    env2.values[0] = (Value *) attrs;
     
     body->eval(state, env2, v);
 }