From 4454164195809811aff64ffb9fb6d8f3207a3a10 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sat, 10 May 2025 18:33:25 -0500
Subject: [PATCH] + xo-refcnt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c76226c7..06c4dea0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@ message("-- CMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}")
 
 add_subdirectory(xo-cmake)
 add_subdirectory(xo-indentlog)
-#add_subdirectory(xo-refcnt)
+add_subdirectory(xo-refcnt)
 #add_subdirectory(xo-subsys)
 #add_subdirectory(xo-randomgen)
 #add_subdirectory(xo-ordinaltree)
diff --git a/default.nix b/default.nix
index 5b619074..0b33fdcc 100644
--- a/default.nix
+++ b/default.nix
@@ -39,7 +39,7 @@ let
         {
           xo-cmake          = self.callPackage pkgs/xo-cmake.nix          {};
           xo-indentlog      = self.callPackage pkgs/xo-indentlog.nix      {};
-#          xo-refcnt         = self.callPackage pkgs/xo-refcnt.nix         {};
+          xo-refcnt         = self.callPackage pkgs/xo-refcnt.nix         {};
 #          xo-subsys         = self.callPackage pkgs/xo-subsys.nix         {};
 #          xo-randomgen      = self.callPackage pkgs/xo-randomgen.nix      {};
 #          xo-ordinaltree    = self.callPackage pkgs/xo-ordinaltree.nix    {};
diff --git a/pkgs/xo-refcnt.nix b/pkgs/xo-refcnt.nix
new file mode 100644
index 00000000..1bbeb924
--- /dev/null
+++ b/pkgs/xo-refcnt.nix
@@ -0,0 +1,20 @@
+{
+  # dependencies
+  stdenv, cmake, catch2,
+
+  # xo dependencies
+  xo-cmake, xo-indentlog
+} :
+
+stdenv.mkDerivation (finalattrs:
+  {
+    name = "xo-refcnt";
+    version = "1.0";
+
+    src = ../xo-refcnt;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"];
+    doCheck = true;
+    propagatedBuildInputs = [ xo-indentlog ];
+    nativeBuildInputs = [ cmake catch2 xo-cmake ];
+  })
diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix
index b70bb3f6..9ec8008c 100644
--- a/pkgs/xo-userenv.nix
+++ b/pkgs/xo-userenv.nix
@@ -24,8 +24,8 @@
   # xo dependencies
   xo-cmake,
   xo-indentlog,
+  xo-refcnt,
 #  xo-subsys,
-#  xo-refcnt,
 #  xo-randomgen,
 #  xo-ordinaltree,
 #  xo-flatstring,
@@ -59,7 +59,7 @@ buildEnv {
   name = "xo-userenv";
   paths = [ xo-cmake
             xo-indentlog
-#            xo-refcnt
+            xo-refcnt
 #            xo-subsys
 #            xo-randomgen
 #            xo-ordinaltree