diff --git a/CMakeLists.txt b/CMakeLists.txt index 51803b05..e1cde265 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ add_subdirectory(xo-ordinaltree) add_subdirectory(xo-flatstring) add_subdirectory(xo-pyutil) add_subdirectory(xo-reflectutil) -#add_subdirectory(xo-reflect) +add_subdirectory(xo-reflect) #add_subdirectory(xo-pyreflect) #add_subdirectory(xo-ratio) #add_subdirectory(xo-unit) diff --git a/default.nix b/default.nix index 031260eb..2fcd82b6 100644 --- a/default.nix +++ b/default.nix @@ -46,7 +46,7 @@ let xo-flatstring = self.callPackage pkgs/xo-flatstring.nix {}; xo-pyutil = self.callPackage pkgs/xo-pyutil.nix {}; xo-reflectutil = self.callPackage pkgs/xo-reflectutil.nix {}; -# xo-reflect = self.callPackage pkgs/xo-reflect.nix {}; + xo-reflect = self.callPackage pkgs/xo-reflect.nix {}; # xo-pyreflect = self.callPackage pkgs/xo-pyreflect.nix {}; # xo-ratio = self.callPackage pkgs/xo-ratio.nix {}; # xo-unit = self.callPackage pkgs/xo-unit.nix {}; diff --git a/pkgs/xo-reflect.nix b/pkgs/xo-reflect.nix new file mode 100644 index 00000000..d332c13a --- /dev/null +++ b/pkgs/xo-reflect.nix @@ -0,0 +1,19 @@ +{ + # nixpkgs dependencies + stdenv, cmake, catch2, + + # xo dependencies + xo-cmake, xo-refcnt, xo-subsys +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-reflect"; + + src = ../xo-reflect; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + doCheck = true; + nativeBuildInputs = [ cmake catch2 xo-cmake ]; + propagatedBuildInputs = [ xo-subsys xo-refcnt ]; + }) diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix index 99e8c2ad..f6b1dba8 100644 --- a/pkgs/xo-userenv.nix +++ b/pkgs/xo-userenv.nix @@ -31,10 +31,10 @@ xo-flatstring, xo-pyutil, xo-reflectutil, + xo-reflect, # xo-ratio, # xo-unit, # xo-pyunit, -# xo-reflect, # xo-pyreflect, # xo-printjson, # xo-pyprintjson, @@ -66,7 +66,7 @@ buildEnv { xo-flatstring xo-pyutil xo-reflectutil -# xo-reflect + xo-reflect # xo-pyreflect # xo-ratio # xo-unit