From 97b2789fc52ddfecdc3579f4af1cc0078455ab23 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Mon, 10 Mar 2025 14:57:11 -0700
Subject: [PATCH 1/2] freebsd.libbsdxml: split debug output

---
 pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix
index 333e4048c837..fe432578d0ca 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libbsdxml.nix
@@ -3,4 +3,8 @@ mkDerivation {
   path = "lib/libexpat";
   extraPaths = [ "contrib/expat" ];
   buildInputs = [ ];
+  outputs = [
+    "out"
+    "debug"
+  ];
 }

From 9543cc5eccc04ec6f6f863600a913b4b83d9d639 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Tue, 11 Mar 2025 02:13:14 -0700
Subject: [PATCH 2/2] freebsd.geom: split outputs; link gpart manpage

---
 pkgs/os-specific/bsd/freebsd/pkgs/geom.nix    | 18 ++++++++++++++++++
 pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix |  7 +++++++
 2 files changed, 25 insertions(+)

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/geom.nix b/pkgs/os-specific/bsd/freebsd/pkgs/geom.nix
index 552d2e420120..3eb46ee32217 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/geom.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/geom.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   mkDerivation,
   libgeom,
   libufs,
@@ -18,6 +19,12 @@ let
       "sys/opencrypto"
     ];
 
+    outputs = [
+      "out"
+      "man"
+      "debug"
+    ];
+
     # libgeom needs sbuf and bsdxml but linker doesn't know that
     buildInputs = [
       libgeom
@@ -37,8 +44,19 @@ mkDerivation {
     "lib/Makefile.inc"
     "lib/geom"
   ];
+  outputs = [
+    "out"
+    "man"
+    "debug"
+  ];
 
   GEOM_CLASS_DIR = "${libs}/lib";
 
+  # link in man pages from libs
+  postInstall = ''
+    mkdir -p $man/share/man/man8
+    ln -s ${lib.getMan libs}/share/man/man8/*.8* $man/share/man/man8/
+  '';
+
   buildInputs = [ libgeom ];
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix
index 295d9d75c537..8a904453288a 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libgeom.nix
@@ -5,6 +5,13 @@
 }:
 mkDerivation {
   path = "lib/libgeom";
+
+  outputs = [
+    "out"
+    "man"
+    "debug"
+  ];
+
   buildInputs = [
     libbsdxml
     libsbuf