From 4dd0deba1af67090feca4e6c894fce85ddd3a82c Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Fri, 22 May 2026 07:47:29 -0400
Subject: [PATCH] nix build: fix xo-arena, xo-alloc2 packaging

---
 pkgs/xo-alloc2.nix |  5 +++++
 pkgs/xo-arena.nix  | 17 ++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/xo-alloc2.nix b/pkgs/xo-alloc2.nix
index 74d86500..c99fe285 100644
--- a/pkgs/xo-alloc2.nix
+++ b/pkgs/xo-alloc2.nix
@@ -10,7 +10,9 @@
   # xo dependencies
   xo-facet,
   xo-randomgen,
+  xo-arena,
   xo-subsys,
+  xo-testutil,
 #  xo-callback,
 #  xo-unit,
 #  xo-reflect,
@@ -47,6 +49,8 @@ stdenv.mkDerivation (finalattrs:
       cli11
       xo-randomgen
       xo-cmake
+    ] ++ lib.optionals doCheck [
+      xo-testutil
     ] ++ lib.optionals buildDocs [
       doxygen
       sphinx
@@ -58,6 +62,7 @@ stdenv.mkDerivation (finalattrs:
       python3Packages.pillow
     ];
     propagatedBuildInputs = [
+      xo-arena
       xo-facet
       xo-subsys
 #      xo-callback
diff --git a/pkgs/xo-arena.nix b/pkgs/xo-arena.nix
index a2c7a794..cf59aac7 100644
--- a/pkgs/xo-arena.nix
+++ b/pkgs/xo-arena.nix
@@ -1,7 +1,12 @@
 {
   # nixpkgs dependencies
-  lib, stdenv, cmake, catch2,
+  lib, stdenv,
+
+  cmake, catch2,
   doxygen,
+  elfutils ? null,   # ignored on osx
+  libunwind,
+  pkg-config,
 
   python3Packages,
 
@@ -35,8 +40,11 @@ stdenv.mkDerivation (finalattrs:
     '';
 
     nativeBuildInputs = [
-      cmake catch2
-      xo-cmake xo-randomgen
+      cmake
+      catch2
+      pkg-config
+      xo-cmake
+      xo-randomgen
     ] ++ lib.optionals buildDocs [
       doxygen
       sphinx
@@ -50,5 +58,8 @@ stdenv.mkDerivation (finalattrs:
     propagatedBuildInputs = [
       xo-reflectutil
       xo-indentlog
+      libunwind
+    ] ++ lib.optionals stdenv.isLinux [
+      elfutils.dev
     ];
   })