diff --git a/CMakeLists.txt b/CMakeLists.txt index 917119c3..20d7f332 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,7 @@ add_subdirectory(xo-pyprintjson) add_subdirectory(xo-reactor) add_subdirectory(xo-pyreactor) add_subdirectory(xo-websock) +add_subdirectory(xo-pywebsock) # add_subdirectory(xo-expression) add_subdirectory(xo-pyexpression) @@ -95,7 +96,6 @@ add_subdirectory(xo-reader) add_subdirectory(xo-jit) add_subdirectory(xo-pyjit) # -#add_subdirectory(xo-pywebsock) #add_subdirectory(xo-statistics) #add_subdirectory(xo-distribution) #add_subdirectory(xo-pydistribution) diff --git a/default.nix b/default.nix index b87710e5..0ef1b6e7 100644 --- a/default.nix +++ b/default.nix @@ -60,6 +60,7 @@ let 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-pywebsock = self.callPackage pkgs/xo-pywebsock.nix {}; # xo-expression = self.callPackage pkgs/xo-expression.nix {}; xo-pyexpression = self.callPackage pkgs/xo-pyexpression.nix {}; @@ -70,7 +71,6 @@ let clang = llvmPackages.clang; llvm = llvmPackages.llvm; }; xo-pyjit = self.callPackage pkgs/xo-pyjit.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 {}; # xo-pydistribution = self.callPackage pkgs/xo-pydistribution.nix {}; diff --git a/pkgs/xo-pywebsock.nix b/pkgs/xo-pywebsock.nix new file mode 100644 index 00000000..0a20ecd3 --- /dev/null +++ b/pkgs/xo-pywebsock.nix @@ -0,0 +1,33 @@ +{ + # nixpkgs dependencies + stdenv, cmake, catch2, + + python3Packages, + + # xo dependencies + xo-cmake, + #xo-refcnt, + xo-websock, + + xo-pyreflect, + xo-pywebutil +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-pywebsock"; + + src = ../xo-pywebsock; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + #doCheck = true; + nativeBuildInputs = [ cmake catch2 xo-cmake ]; + propagatedBuildInputs = [ +# xo-printjson + xo-pywebutil + xo-pyreflect + xo-websock +# python3Packages.python +# python3Packages.pybind11 + ]; + }) diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix index 58482a32..04fd84fa 100644 --- a/pkgs/xo-userenv.nix +++ b/pkgs/xo-userenv.nix @@ -45,10 +45,10 @@ xo-reactor, xo-pyreactor, xo-websock, + xo-pywebsock, # xo-simulator, # xo-pysimulator, xo-distribution, xo-pydistribution, xo-process, xo-pyprocess, xo-statistics, xo-kalmanfilter, # xo-pykalmanfilter, -# xo-pywebsock, xo-expression, xo-pyexpression, @@ -94,7 +94,7 @@ buildEnv { xo-reactor xo-pyreactor xo-websock -# xo-pywebsock + xo-pywebsock # xo-statistics # xo-distribution # xo-pydistribution diff --git a/xo-pywebsock/CMakeLists.txt b/xo-pywebsock/CMakeLists.txt index 56e9f2eb..37b10b60 100644 --- a/xo-pywebsock/CMakeLists.txt +++ b/xo-pywebsock/CMakeLists.txt @@ -5,7 +5,7 @@ project(xo_pywebsock VERSION 1.0) include(cmake/xo-bootstrap-macros.cmake) -xo_cxx_toplevel_options() +xo_cxx_toplevel_options3() add_subdirectory(src/pywebsock)