diff --git a/default.nix b/default.nix index 93d476dc..bdfe93b1 100644 --- a/default.nix +++ b/default.nix @@ -135,11 +135,12 @@ let { xo-cmake = self.callPackage pkgs/xo-cmake.nix {}; xo-indentlog = self.callPackage pkgs/xo-indentlog.nix { buildDocs = true; buildExamples = true; }; - xo-refcnt = self.callPackage pkgs/xo-refcnt.nix {}; xo-subsys = self.callPackage pkgs/xo-subsys.nix {}; xo-randomgen = self.callPackage pkgs/xo-randomgen.nix { buildExamples = true; }; xo-reflectutil = self.callPackage pkgs/xo-reflectutil.nix {}; xo-arena = self.callPackage pkgs/xo-arena.nix {}; + xo-facet = self.callPackage pkgs/xo-facet.nix {}; + xo-refcnt = self.callPackage pkgs/xo-refcnt.nix {}; xo-ordinaltree = self.callPackage pkgs/xo-ordinaltree.nix {}; xo-flatstring = self.callPackage pkgs/xo-flatstring.nix { buildDocs = true; buildExamples = true; }; xo-pyutil = self.callPackage pkgs/xo-pyutil.nix {}; @@ -483,6 +484,7 @@ in subsys = pkgs.xo-subsys; randomgen = pkgs.xo-randomgen; arena = pkgs.xo-arena; + facet = pkgs.xo-facet; ordinaltree = pkgs.xo-ordinaltree; flatstring = pkgs.xo-flatstring; pyutil = pkgs.xo-pyutil; diff --git a/pkgs/xo-facet.nix b/pkgs/xo-facet.nix new file mode 100644 index 00000000..79fec39c --- /dev/null +++ b/pkgs/xo-facet.nix @@ -0,0 +1,30 @@ +{ + # nixpkgs dependencies + stdenv, cmake, catch2, + + # xo dependencies + xo-cmake, + xo-arena, +# xo-reflectutil, +# xo-indentlog, +} : + +stdenv.mkDerivation (finalattrs: + { + name = "xo-facet"; + + src = ../xo-facet; + + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake" + "-DENABLE_TESTING=1" + ]; + doCheck = true; + nativeBuildInputs = [ + cmake catch2 xo-cmake + ]; + propagatedBuildInputs = [ + xo-arena +# xo-reflectutil +# xo-indentlog + ]; + })