diff --git a/CMakeLists.txt b/CMakeLists.txt index 303dbff8..bb03ed90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,6 +82,7 @@ add_subdirectory(xo-pyunit) add_subdirectory(xo-callback) add_subdirectory(xo-webutil) add_subdirectory(xo-pywebutil) +add_subdirectory(xo-printjson) # add_subdirectory(xo-expression) add_subdirectory(xo-pyexpression) @@ -90,7 +91,6 @@ add_subdirectory(xo-reader) add_subdirectory(xo-jit) add_subdirectory(xo-pyjit) # -#add_subdirectory(xo-printjson) #add_subdirectory(xo-pyprintjson) #add_subdirectory(xo-reactor) #add_subdirectory(xo-pyreactor) diff --git a/default.nix b/default.nix index c659b221..cb9d7093 100644 --- a/default.nix +++ b/default.nix @@ -55,6 +55,7 @@ let xo-callback = self.callPackage pkgs/xo-callback.nix {}; 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-expression = self.callPackage pkgs/xo-expression.nix {}; xo-pyexpression = self.callPackage pkgs/xo-pyexpression.nix {}; @@ -65,7 +66,6 @@ let clang = llvmPackages.clang; llvm = llvmPackages.llvm; }; xo-pyjit = self.callPackage pkgs/xo-pyjit.nix {}; -# xo-printjson = self.callPackage pkgs/xo-printjson.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 {}; diff --git a/pkgs/xo-printjson.nix b/pkgs/xo-printjson.nix new file mode 100644 index 00000000..dc17c7b2 --- /dev/null +++ b/pkgs/xo-printjson.nix @@ -0,0 +1,28 @@ +{ + # nixpkgs dependencies + stdenv, cmake, catch2, + + # xo dependencies + xo-cmake, +# xo-refcnt, + xo-reflect, + #, xo-indentlog, +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-printjson"; + + src = ../xo-printjson; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + doCheck = true; + nativeBuildInputs = [ + cmake catch2 xo-cmake + ]; + propagatedBuildInputs = [ +# xo-refcnt + xo-reflect +# xo-indentlog + ]; + }) diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix index 82f98112..784d1f2c 100644 --- a/pkgs/xo-userenv.nix +++ b/pkgs/xo-userenv.nix @@ -40,7 +40,7 @@ xo-callback, xo-webutil, xo-pywebutil, -# xo-printjson, + xo-printjson, # xo-pyprintjson, # xo-reactor, # xo-pyreactor, @@ -80,6 +80,7 @@ buildEnv { xo-callback xo-webutil xo-pywebutil + xo-printjson # xo-expression xo-pyexpression @@ -87,7 +88,6 @@ buildEnv { xo-reader xo-jit xo-pyjit -# xo-printjson # xo-pyprintjson # xo-reactor # xo-pyreactor