From 127ebc549b3112d2506ec2868ce67a4b6d49769c Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 11 May 2025 16:14:56 -0500 Subject: [PATCH] + xo-process --- CMakeLists.txt | 3 +-- default.nix | 2 +- pkgs/xo-process.nix | 31 +++++++++++++++++++++++++++++++ pkgs/xo-userenv.nix | 4 ++-- 4 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 pkgs/xo-process.nix diff --git a/CMakeLists.txt b/CMakeLists.txt index 30b2d0ae..4ae4987a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ add_subdirectory(xo-distribution) add_subdirectory(xo-pydistribution) add_subdirectory(xo-simulator) add_subdirectory(xo-pysimulator) -#add_subdirectory(xo-process) +add_subdirectory(xo-process) # add_subdirectory(xo-expression) add_subdirectory(xo-pyexpression) @@ -103,7 +103,6 @@ add_subdirectory(xo-reader) add_subdirectory(xo-jit) add_subdirectory(xo-pyjit) # -#add_subdirectory(xo-process) #add_subdirectory(xo-pyprocess) #add_subdirectory(xo-kalmanfilter) #add_subdirectory(xo-pykalmanfilter) diff --git a/default.nix b/default.nix index 1f99d5e9..106bf973 100644 --- a/default.nix +++ b/default.nix @@ -67,7 +67,7 @@ let xo-pydistribution = self.callPackage pkgs/xo-pydistribution.nix {}; xo-simulator = self.callPackage pkgs/xo-simulator.nix {}; xo-pysimulator = self.callPackage pkgs/xo-pysimulator.nix {}; -# xo-process = self.callPackage pkgs/xo-process.nix {}; + xo-process = self.callPackage pkgs/xo-process.nix {}; # xo-expression = self.callPackage pkgs/xo-expression.nix {}; xo-pyexpression = self.callPackage pkgs/xo-pyexpression.nix {}; diff --git a/pkgs/xo-process.nix b/pkgs/xo-process.nix new file mode 100644 index 00000000..81f4e464 --- /dev/null +++ b/pkgs/xo-process.nix @@ -0,0 +1,31 @@ +{ + # nixpkgs dependencies + stdenv, cmake, catch2, + + # xo dependencies + xo-cmake, +# xo-refcnt, +# xo-reflect, + # xo-reactor, + xo-simulator, + #, xo-indentlog, +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-process"; + + src = ../xo-process; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + doCheck = true; + nativeBuildInputs = [ + cmake catch2 xo-cmake + ]; + propagatedBuildInputs = [ + xo-simulator +# xo-refcnt +# xo-reflect +# xo-indentlog + ]; + }) diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix index 2f4a02bc..3b18646d 100644 --- a/pkgs/xo-userenv.nix +++ b/pkgs/xo-userenv.nix @@ -52,7 +52,7 @@ xo-pydistribution, xo-simulator, xo-pysimulator, -# xo-process, + xo-process, #xo-pyprocess, #xo-kalmanfilter, # xo-pykalmanfilter, @@ -100,7 +100,7 @@ buildEnv { xo-pydistribution xo-simulator xo-pysimulator -# xo-process + xo-process # xo-expression xo-pyexpression