+ xo-indentlog build

.github/workflows/main-stock-ubuntu.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: bootstrap xo-cmake
         run: |
-          PREFIX=${{github.workspace}}//local
+          PREFIX=${{github.workspace}}/local
           mkdir -p ${PREFIX}
           echo "::group::xo-cmake configure"
           cmake -B .build0 -S xo-cmake -DCMAKE_INSTALL_PREFIX=${PREFIX}

CMakeLists.txt

@@ -65,7 +65,7 @@ message("-- CMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}")
 # xo satellite projects
 
 add_subdirectory(xo-cmake)
-#add_subdirectory(xo-indentlog)
+add_subdirectory(xo-indentlog)
 #add_subdirectory(xo-refcnt)
 #add_subdirectory(xo-subsys)
 #add_subdirectory(xo-randomgen)

default.nix

@@ -38,7 +38,7 @@ let
 
         {
           xo-cmake          = self.callPackage pkgs/xo-cmake.nix          {};
-#          xo-indentlog      = self.callPackage pkgs/xo-indentlog.nix      {};
+          xo-indentlog      = self.callPackage pkgs/xo-indentlog.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      {};

pkgs/xo-indentlog.nix

@@ -0,0 +1,18 @@
+{
+  # dependencies
+  stdenv, cmake, catch2,
+
+  xo-cmake,
+} :
+
+stdenv.mkDerivation (finalattrs:
+  {
+    name = "xo-indentlog";
+    version = "1.0";
+
+    src = ../xo-indentlog;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"];
+    doCheck = true;
+    nativeBuildInputs = [ cmake catch2 xo-cmake ];
+  })

pkgs/xo-userenv.nix

@@ -23,7 +23,7 @@
 
   # xo dependencies
   xo-cmake,
-#  xo-indentlog,
+  xo-indentlog,
 #  xo-subsys,
 #  xo-refcnt,
 #  xo-randomgen,
@@ -58,7 +58,7 @@
 buildEnv {
   name = "xo-userenv";
   paths = [ xo-cmake
-#            xo-indentlog
+            xo-indentlog
 #            xo-refcnt
 #            xo-subsys
 #            xo-randomgen