From 54f3e9bd86ad50b4e19eaafcaa77ba3692930f59 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 11 May 2025 15:13:45 -0500
Subject: [PATCH] + xo-reactor

---
 CMakeLists.txt      |  2 +-
 default.nix         |  2 +-
 pkgs/xo-reactor.nix | 32 ++++++++++++++++++++++++++++++++
 pkgs/xo-userenv.nix |  4 ++--
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/xo-reactor.nix

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f8cf7ab..a07236de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,6 +84,7 @@ add_subdirectory(xo-webutil)
 add_subdirectory(xo-pywebutil)
 add_subdirectory(xo-printjson)
 add_subdirectory(xo-pyprintjson)
+add_subdirectory(xo-reactor)
 #
 add_subdirectory(xo-expression)
 add_subdirectory(xo-pyexpression)
@@ -92,7 +93,6 @@ add_subdirectory(xo-reader)
 add_subdirectory(xo-jit)
 add_subdirectory(xo-pyjit)
 #
-#add_subdirectory(xo-reactor)
 #add_subdirectory(xo-pyreactor)
 #add_subdirectory(xo-websock)
 #add_subdirectory(xo-pywebsock)
diff --git a/default.nix b/default.nix
index 2fb7fc4d..5dff4f87 100644
--- a/default.nix
+++ b/default.nix
@@ -57,6 +57,7 @@ let
           xo-pywebutil      = self.callPackage pkgs/xo-pywebutil.nix      {};
           xo-printjson      = self.callPackage pkgs/xo-printjson.nix      {};
           xo-pyprintjson    = self.callPackage pkgs/xo-pyprintjson.nix    {};
+          xo-reactor        = self.callPackage pkgs/xo-reactor.nix        {};
 #
           xo-expression     = self.callPackage pkgs/xo-expression.nix     {};
           xo-pyexpression   = self.callPackage pkgs/xo-pyexpression.nix   {};
@@ -67,7 +68,6 @@ let
                                                                             clang = llvmPackages.clang;
                                                                             llvm = llvmPackages.llvm; };
           xo-pyjit          = self.callPackage pkgs/xo-pyjit.nix          {};
-#          xo-reactor        = self.callPackage pkgs/xo-reactor.nix        {};
 #          xo-pyreactor      = self.callPackage pkgs/xo-pyreactor.nix      {};
 #          xo-websock        = self.callPackage pkgs/xo-websock.nix        {};
 #          xo-pywebsock      = self.callPackage pkgs/xo-pywebsock.nix      {};
diff --git a/pkgs/xo-reactor.nix b/pkgs/xo-reactor.nix
new file mode 100644
index 00000000..27f750ff
--- /dev/null
+++ b/pkgs/xo-reactor.nix
@@ -0,0 +1,32 @@
+{
+  # nixpkgs dependencies
+  stdenv, cmake, catch2,
+
+  # xo dependencies
+  xo-cmake,
+  xo-reflect,
+  xo-webutil,
+  xo-printjson,
+  xo-ordinaltree,
+    #, xo-indentlog,
+} :
+
+stdenv.mkDerivation (finalattrs:
+  {
+    name = "xo-reactor";
+
+    src = ../xo-reactor;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"];
+    doCheck = true;
+    nativeBuildInputs = [
+      cmake catch2 xo-cmake
+    ];
+    propagatedBuildInputs = [
+      xo-reflect
+      xo-webutil
+      xo-printjson
+      xo-ordinaltree
+#      xo-indentlog
+    ];
+  })
diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix
index e097c985..89195b56 100644
--- a/pkgs/xo-userenv.nix
+++ b/pkgs/xo-userenv.nix
@@ -42,7 +42,7 @@
   xo-pywebutil,
   xo-printjson,
   xo-pyprintjson,
-#  xo-reactor,
+  xo-reactor,
 #  xo-pyreactor,
 #  xo-simulator,
 #  xo-pysimulator, xo-distribution, xo-pydistribution, xo-process, xo-pyprocess, xo-statistics, xo-kalmanfilter,
@@ -89,7 +89,7 @@ buildEnv {
             xo-jit
             xo-pyjit
             xo-pyprintjson
-#            xo-reactor
+            xo-reactor
 #            xo-pyreactor
 #            xo-websock
 #            xo-pywebsock