diff --git a/default.nix b/default.nix index 933f95f6..3c2a5695 100644 --- a/default.nix +++ b/default.nix @@ -162,6 +162,7 @@ let xo-stringtable2 = self.callPackage pkgs/xo-stringtable2.nix { stdenv = jitStdenv; }; xo-gc = self.callPackage pkgs/xo-gc.nix { stdenv = jitStdenv; buildDocs = true; }; xo-object = self.callPackage pkgs/xo-object.nix { stdenv = jitStdenv; }; + xo-type = self.callPackage pkgs/xo-type.nix { stdenv = jitStdenv; }; xo-object2 = self.callPackage pkgs/xo-object2.nix { stdenv = jitStdenv; }; xo-procedure2 = self.callPackage pkgs/xo-procedure2.nix { stdenv = jitStdenv; }; @@ -519,6 +520,7 @@ in stringtable2 = pkgs.xo-stringtable2; gc = pkgs.xo-gc; object = pkgs.xo-object; + type = pkgs.xo-type; object2 = pkgs.xo-object2; procedure2 = pkgs.xo-procedure2; numeric = pkgs.xo-numeric; diff --git a/pkgs/xo-type.nix b/pkgs/xo-type.nix new file mode 100644 index 00000000..8979b078 --- /dev/null +++ b/pkgs/xo-type.nix @@ -0,0 +1,43 @@ +{ + # nixpkgs dependencies + lib, stdenv, cmake, catch2, + + # xo dependencies +# xo-reflectutil, +# xo-alloc, + # xo-randomgen, +# xo-gc, +# xo-stringtable2, + xo-alloc2, +# xo-printable2, + xo-facet, + xo-subsys, + xo-cmake, + doCheck ? true, +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-type"; + + src = ../xo-type; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"] + ++ lib.optionals doCheck ["-DENABLE_TESTING=1"]; + + inherit doCheck; + + nativeBuildInputs = [ + cmake catch2 + xo-cmake + ]; + propagatedBuildInputs = [ +# xo-gc +# xo-reflect + xo-alloc2 +# xo-stringtable2 +# xo-printable2 + xo-subsys + xo-facet + ]; + }) diff --git a/xo-type/cmake/xo_typeConfig.cmake.in b/xo-type/cmake/xo_typeConfig.cmake.in index 2c4c0d1d..186f1817 100644 --- a/xo-type/cmake/xo_typeConfig.cmake.in +++ b/xo-type/cmake/xo_typeConfig.cmake.in @@ -3,6 +3,7 @@ include(CMakeFindDependencyMacro) find_dependency(xo_alloc2) find_dependency(xo_facet) +find_dependency(subsys) # note: changes to find_dependency() calls here # must coordinate with xo_dependency() calls diff --git a/xo-type/src/type/CMakeLists.txt b/xo-type/src/type/CMakeLists.txt index 36f88958..806e67a9 100644 --- a/xo-type/src/type/CMakeLists.txt +++ b/xo-type/src/type/CMakeLists.txt @@ -21,5 +21,6 @@ xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 $ xo_dependency(${SELF_LIB} xo_alloc2) xo_dependency(${SELF_LIB} xo_facet) +xo_dependency(${SELF_LIB} subsys) # end src/type/CMakeLists.txt