2 files changed, 4 insertions, 3 deletions
diff --git a/third_party/nix/src/libexpr/eval.cc b/third_party/nix/src/libexpr/eval.cc
index 4064f1594f00..4b848d054c2b 100644
--- a/third_party/nix/src/libexpr/eval.cc
+++ b/third_party/nix/src/libexpr/eval.cc
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <chrono>
+#include <cstdint>
 #include <cstring>
 #include <fstream>
 #include <iostream>
@@ -903,7 +904,7 @@ static std::string showAttrPath(EvalState& state, Env& env,
   return out.str();
 }
 
-unsigned long nrLookups = 0;
+uint64_t nrLookups = 0;
 
 void ExprSelect::eval(EvalState& state, Env& env, Value& v) {
   Value vTmp;
diff --git a/third_party/nix/src/libexpr/value.hh b/third_party/nix/src/libexpr/value.hh
index bb151b0f308b..df6563cf1cd3 100644
--- a/third_party/nix/src/libexpr/value.hh
+++ b/third_party/nix/src/libexpr/value.hh
@@ -11,7 +11,7 @@
 
 namespace nix {
 
-typedef enum {
+using ValueType = enum {
   tInt = 1,
   tBool,
   tString,
@@ -27,7 +27,7 @@ typedef enum {
   tPrimOpApp,
   _reserved1,  // formerly tExternal
   tFloat
-} ValueType;
+};
 
 class Bindings;
 struct Env;