diff --git a/default.nix b/default.nix
index f8e6bfd3..933f95f6 100644
--- a/default.nix
+++ b/default.nix
@@ -168,6 +168,7 @@ let
             xo-numeric        = self.callPackage pkgs/xo-numeric.nix        { stdenv = jitStdenv; };
 
             xo-ordinaltree    = self.callPackage pkgs/xo-ordinaltree.nix    { stdenv = jitStdenv; };
+            xo-tokenizer2     = self.callPackage pkgs/xo-tokenizer2.nix     { stdenv = jitStdenv;                   buildExamples = true; };
             #
             xo-webutil        = self.callPackage pkgs/xo-webutil.nix        { stdenv = jitStdenv; };
             xo-pywebutil      = self.callPackage pkgs/xo-pywebutil.nix      {};
@@ -521,8 +522,9 @@ in
     object2        = pkgs.xo-object2;
     procedure2     = pkgs.xo-procedure2;
     numeric        = pkgs.xo-numeric;
-
     ordinaltree    = pkgs.xo-ordinaltree;
+    tokenizer2     = pkgs.xo-tokenizer2;
+
     webutil        = pkgs.xo-webutil;
     pywebutil      = pkgs.xo-pywebutil;
     printjson      = pkgs.xo-printjson;
diff --git a/pkgs/xo-indentlog.nix b/pkgs/xo-indentlog.nix
index 3247d044..298dfe9f 100644
--- a/pkgs/xo-indentlog.nix
+++ b/pkgs/xo-indentlog.nix
@@ -10,6 +10,7 @@
 
   buildDocs ? false,
   buildExamples ? false,
+  doCheck ? true,
 } :
 
 stdenv.mkDerivation (finalattrs:
@@ -25,8 +26,7 @@ stdenv.mkDerivation (finalattrs:
 
     inherit buildDocs;
     inherit buildExamples;
-
-    doCheck = true;
+    inherit doCheck;
 
     postBuild = lib.optionalString buildDocs ''
       cmake --build . -- docs
diff --git a/pkgs/xo-tokenizer2.nix b/pkgs/xo-tokenizer2.nix
new file mode 100644
index 00000000..24266e72
--- /dev/null
+++ b/pkgs/xo-tokenizer2.nix
@@ -0,0 +1,34 @@
+{
+  # nixpkgs dependencies
+  lib, stdenv, cmake, catch2, replxx,
+
+  xo-arena,
+  xo-indentlog,
+  xo-cmake,
+
+  buildExamples ? true,
+  doCheck ? true,
+} :
+
+stdenv.mkDerivation (finalattrs:
+  {
+    name = "xo-tokenizer2";
+
+    src = ../xo-tokenizer2;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]
+                 ++ lib.optionals doCheck ["-DENABLE_TESTING=1"]
+                 ++ lib.optionals buildExamples ["-DXO_ENABLE_EXAMPLES=on"];
+
+    inherit buildExamples;
+    inherit doCheck;
+
+    nativeBuildInputs = [
+      cmake catch2 replxx
+      xo-cmake
+    ];
+    propagatedBuildInputs = [
+      xo-arena
+      xo-indentlog
+    ];
+  })