From 605b0f6d3640db5e45ba5bff72862955cc7d9ebe Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sun, 11 May 2025 15:20:14 -0500
Subject: [PATCH] + xo-websock

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a3135bb..917119c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,7 @@ add_subdirectory(xo-printjson)
 add_subdirectory(xo-pyprintjson)
 add_subdirectory(xo-reactor)
 add_subdirectory(xo-pyreactor)
+add_subdirectory(xo-websock)
 #
 add_subdirectory(xo-expression)
 add_subdirectory(xo-pyexpression)
@@ -94,7 +95,6 @@ add_subdirectory(xo-reader)
 add_subdirectory(xo-jit)
 add_subdirectory(xo-pyjit)
 #
-#add_subdirectory(xo-websock)
 #add_subdirectory(xo-pywebsock)
 #add_subdirectory(xo-statistics)
 #add_subdirectory(xo-distribution)
diff --git a/default.nix b/default.nix
index 1ddeeb7a..b87710e5 100644
--- a/default.nix
+++ b/default.nix
@@ -59,6 +59,7 @@ let
           xo-pyprintjson    = self.callPackage pkgs/xo-pyprintjson.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-expression     = self.callPackage pkgs/xo-expression.nix     {};
           xo-pyexpression   = self.callPackage pkgs/xo-pyexpression.nix   {};
@@ -69,7 +70,6 @@ let
                                                                             clang = llvmPackages.clang;
                                                                             llvm = llvmPackages.llvm; };
           xo-pyjit          = self.callPackage pkgs/xo-pyjit.nix          {};
-#          xo-websock        = self.callPackage pkgs/xo-websock.nix        {};
 #          xo-pywebsock      = self.callPackage pkgs/xo-pywebsock.nix      {};
 #          xo-statistics     = self.callPackage pkgs/xo-statistics.nix     {};
 #          xo-distribution   = self.callPackage pkgs/xo-distribution.nix   {};
diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix
index 4d524966..58482a32 100644
--- a/pkgs/xo-userenv.nix
+++ b/pkgs/xo-userenv.nix
@@ -44,9 +44,11 @@
   xo-pyprintjson,
   xo-reactor,
   xo-pyreactor,
+  xo-websock,
 #  xo-simulator,
 #  xo-pysimulator, xo-distribution, xo-pydistribution, xo-process, xo-pyprocess, xo-statistics, xo-kalmanfilter,
-#  xo-pykalmanfilter, xo-websock, xo-pywebsock,
+  #  xo-pykalmanfilter,
+#  xo-pywebsock,
 
   xo-expression,
   xo-pyexpression,
@@ -91,7 +93,7 @@ buildEnv {
             xo-pyprintjson
             xo-reactor
             xo-pyreactor
-#            xo-websock
+            xo-websock
 #            xo-pywebsock
 #            xo-statistics
 #            xo-distribution
diff --git a/pkgs/xo-websock.nix b/pkgs/xo-websock.nix
new file mode 100644
index 00000000..9d024466
--- /dev/null
+++ b/pkgs/xo-websock.nix
@@ -0,0 +1,30 @@
+{
+  # nixpkgs dependencies
+  stdenv, cmake, catch2, libwebsockets, jsoncpp,
+
+  # xo dependencies
+  xo-cmake,
+
+  xo-reactor,
+
+} :
+
+stdenv.mkDerivation (finalattrs:
+  {
+    name = "xo-websock";
+
+    src = ../xo-websock;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"];
+    doCheck = true;
+    nativeBuildInputs = [
+      cmake catch2 xo-cmake
+    ];
+    propagatedBuildInputs = [
+      libwebsockets
+      jsoncpp
+
+      xo-reactor
+#      xo-indentlog
+    ];
+  })