diff --git a/.github/workflows/main-stock-ubuntu.yml b/.github/workflows/main-stock-ubuntu.yml index d4e5b85b..7871b808 100644 --- a/.github/workflows/main-stock-ubuntu.yml +++ b/.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} diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a971cce..c76226c7 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/default.nix b/default.nix index 3c2a1aae..5b619074 100644 --- a/default.nix +++ b/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 {}; diff --git a/pkgs/xo-indentlog.nix b/pkgs/xo-indentlog.nix new file mode 100644 index 00000000..12255020 --- /dev/null +++ b/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 ]; + }) diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix index 541dc999..b70bb3f6 100644 --- a/pkgs/xo-userenv.nix +++ b/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