diff --git a/CMakeLists.txt b/CMakeLists.txt index 405b07bf..51803b05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,7 @@ add_subdirectory(xo-randomgen) add_subdirectory(xo-ordinaltree) add_subdirectory(xo-flatstring) add_subdirectory(xo-pyutil) -#add_subdirectory(xo-reflectutil) +add_subdirectory(xo-reflectutil) #add_subdirectory(xo-reflect) #add_subdirectory(xo-pyreflect) #add_subdirectory(xo-ratio) diff --git a/default.nix b/default.nix index e4f9cd64..031260eb 100644 --- a/default.nix +++ b/default.nix @@ -45,7 +45,7 @@ let xo-ordinaltree = self.callPackage pkgs/xo-ordinaltree.nix {}; 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-reflectutil = self.callPackage pkgs/xo-reflectutil.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 {}; diff --git a/pkgs/xo-reflectutil.nix b/pkgs/xo-reflectutil.nix new file mode 100644 index 00000000..7cc8ce5a --- /dev/null +++ b/pkgs/xo-reflectutil.nix @@ -0,0 +1,21 @@ +{ + # dependencies + stdenv, cmake, #catch2, + + xo-cmake, xo-flatstring, +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-reflectutil"; + version = "1.0"; + + src = ../xo-reflectutil; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + doCheck = true; + nativeBuildInputs = [ cmake #catch2 + xo-cmake + xo-flatstring + ]; + }) diff --git a/pkgs/xo-userenv.nix b/pkgs/xo-userenv.nix index 5c5a299e..99e8c2ad 100644 --- a/pkgs/xo-userenv.nix +++ b/pkgs/xo-userenv.nix @@ -30,7 +30,7 @@ xo-ordinaltree, xo-flatstring, xo-pyutil, -# xo-reflectutil, + xo-reflectutil, # xo-ratio, # xo-unit, # xo-pyunit, @@ -65,7 +65,7 @@ buildEnv { xo-ordinaltree xo-flatstring xo-pyutil -# xo-reflectutil + xo-reflectutil # xo-reflect # xo-pyreflect # xo-ratio