diff --git a/CMakeLists.txt b/CMakeLists.txt index bb03ed90..1f8cf7ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,7 @@ add_subdirectory(xo-callback) add_subdirectory(xo-webutil) add_subdirectory(xo-pywebutil) add_subdirectory(xo-printjson) +add_subdirectory(xo-pyprintjson) # add_subdirectory(xo-expression) add_subdirectory(xo-pyexpression) @@ -91,7 +92,6 @@ add_subdirectory(xo-reader) add_subdirectory(xo-jit) add_subdirectory(xo-pyjit) # -#add_subdirectory(xo-pyprintjson) #add_subdirectory(xo-reactor) #add_subdirectory(xo-pyreactor) #add_subdirectory(xo-websock) diff --git a/default.nix b/default.nix index cb9d7093..2fb7fc4d 100644 --- a/default.nix +++ b/default.nix @@ -56,6 +56,7 @@ let xo-webutil = self.callPackage pkgs/xo-webutil.nix {}; xo-pywebutil = self.callPackage pkgs/xo-pywebutil.nix {}; xo-printjson = self.callPackage pkgs/xo-printjson.nix {}; + xo-pyprintjson = self.callPackage pkgs/xo-pyprintjson.nix {}; # xo-expression = self.callPackage pkgs/xo-expression.nix {}; xo-pyexpression = self.callPackage pkgs/xo-pyexpression.nix {}; @@ -66,7 +67,6 @@ let clang = llvmPackages.clang; llvm = llvmPackages.llvm; }; xo-pyjit = self.callPackage pkgs/xo-pyjit.nix {}; -# xo-pyprintjson = self.callPackage pkgs/xo-pyprintjson.nix {}; # xo-reactor = self.callPackage pkgs/xo-reactor.nix {}; # xo-pyreactor = self.callPackage pkgs/xo-pyreactor.nix {}; # xo-websock = self.callPackage pkgs/xo-websock.nix {}; diff --git a/pkgs/xo-pyprintjson.nix b/pkgs/xo-pyprintjson.nix new file mode 100644 index 00000000..290c60f5 --- /dev/null +++ b/pkgs/xo-pyprintjson.nix @@ -0,0 +1,31 @@ +{ + # nixpkgs dependencies + stdenv, cmake, catch2, + + #python3Packages, + + # xo dependencies + xo-cmake, + #xo-refcnt, + xo-printjson, + + xo-pyreflect, +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-pyprintjson"; + + src = ../xo-pyprintjson; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + #doCheck = true; + nativeBuildInputs = [ cmake catch2 xo-cmake ]; + propagatedBuildInputs = [ + xo-printjson + xo-pyreflect +# xo-refcnt +# python3Packages.python +# python3Packages.pybind11 + ]; + }) diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix index 784d1f2c..e097c985 100644 --- a/pkgs/xo-userenv.nix +++ b/pkgs/xo-userenv.nix @@ -41,7 +41,7 @@ xo-webutil, xo-pywebutil, xo-printjson, -# xo-pyprintjson, + xo-pyprintjson, # xo-reactor, # xo-pyreactor, # xo-simulator, @@ -88,7 +88,7 @@ buildEnv { xo-reader xo-jit xo-pyjit -# xo-pyprintjson + xo-pyprintjson # xo-reactor # xo-pyreactor # xo-websock