From 967524d37bc8e48a899298994e307d085be12566 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Thu, 12 Jun 2025 07:43:30 -0500 Subject: [PATCH] nix: xo-flatstring build docs --- default.nix | 2 +- pkgs/xo-flatstring.nix | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/default.nix b/default.nix index 9bb55dbd..f837fc9b 100644 --- a/default.nix +++ b/default.nix @@ -78,7 +78,7 @@ let xo-subsys = self.callPackage pkgs/xo-subsys.nix {}; xo-randomgen = self.callPackage pkgs/xo-randomgen.nix {}; xo-ordinaltree = self.callPackage pkgs/xo-ordinaltree.nix {}; - xo-flatstring = self.callPackage pkgs/xo-flatstring.nix {}; + xo-flatstring = self.callPackage pkgs/xo-flatstring.nix { buildDocs = true; }; xo-pyutil = self.callPackage pkgs/xo-pyutil.nix {}; xo-reflectutil = self.callPackage pkgs/xo-reflectutil.nix {}; xo-reflect = self.callPackage pkgs/xo-reflect.nix {}; diff --git a/pkgs/xo-flatstring.nix b/pkgs/xo-flatstring.nix index a1b01806..2c141450 100644 --- a/pkgs/xo-flatstring.nix +++ b/pkgs/xo-flatstring.nix @@ -4,7 +4,7 @@ python3Packages, - sphinx, + sphinx, graphviz, xo-cmake, xo-indentlog, @@ -30,8 +30,14 @@ stdenv.mkDerivation (finalattrs: # env.LC_ALL = "en_US.UTF-8"; cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + + inherit buildDocs; doCheck = true; + postBuild = lib.optionalString buildDocs '' + cmake --build . -- docs + ''; + propagatedBuildInputs = [ ]; nativeBuildInputs = [ @@ -42,12 +48,13 @@ stdenv.mkDerivation (finalattrs: xo-cmake xo-indentlog ] -# + lib.optionals buildDocs [ -# doxygen -# sphinx -# python3Packages.sphinx-rtd-theme -# python3Packages.breathe - # ] + ++ lib.optionals buildDocs [ + doxygen + sphinx + graphviz + python3Packages.sphinx-rtd-theme + python3Packages.breathe + ] ; })