From 70f3f4e48689bf42adf1ff01dbdeeb34030bbcf2 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Mon, 22 Sep 2025 12:18:51 -0400 Subject: [PATCH] nix build: xo-randomgen: build+install examples --- default.nix | 2 +- pkgs/xo-randomgen.nix | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index a1885c9f..59a59136 100644 --- a/default.nix +++ b/default.nix @@ -77,7 +77,6 @@ let in { - xo-randomgen = self.callPackage pkgs/xo-randomgen.nix {}; xo-flatstring = self.callPackage pkgs/xo-flatstring.nix { buildDocs = true; }; xo-ratio = self.callPackage pkgs/xo-ratio.nix { buildDocs = true; }; xo-unit = self.callPackage pkgs/xo-unit.nix { buildDocs = true; }; @@ -103,6 +102,7 @@ let 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-ordinaltree = self.callPackage pkgs/xo-ordinaltree.nix {}; xo-pyutil = self.callPackage pkgs/xo-pyutil.nix {}; xo-reflectutil = self.callPackage pkgs/xo-reflectutil.nix {}; diff --git a/pkgs/xo-randomgen.nix b/pkgs/xo-randomgen.nix index 931d79a8..0976df36 100644 --- a/pkgs/xo-randomgen.nix +++ b/pkgs/xo-randomgen.nix @@ -1,9 +1,11 @@ { # nixpkgs dependencies - stdenv, cmake, catch2, + lib, stdenv, cmake, catch2, # xo dependencies xo-cmake, xo-indentlog, + + buildExamples ? false, } : stdenv.mkDerivation (finalattrs: @@ -12,8 +14,13 @@ stdenv.mkDerivation (finalattrs: src = ../xo-randomgen; - cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"]; + cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"] + ++ lib.optionals buildExamples ["-DXO_ENABLE_EXAMPLES=on"]; + + inherit buildExamples; + doCheck = true; + nativeBuildInputs = [ cmake catch2 xo-cmake ]; propagatedBuildInputs = [ xo-indentlog ]; })