From 80d3b5dbf95feb3a968b890886fd8f18b549dae8 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 18 Jun 2024 17:57:33 -0400
Subject: [PATCH] netbsd: No `_mainLibcExtraPaths`

These didn't actually affect `netbsd.compat`, so I inlined the variable
back to `libc` again.
---
 pkgs/os-specific/bsd/netbsd/default.nix          | 13 -------------
 .../bsd/netbsd/pkgs/compat/package.nix           |  3 +--
 pkgs/os-specific/bsd/netbsd/pkgs/libc.nix        | 16 ++++++++++++++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 16b231781e49..15e93de1f1ef 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -138,19 +138,6 @@ makeScopeWithSplicing' {
         inherit (buildPackages.buildPackages) rsync;
       };
 
-      _mainLibcExtraPaths = [
-        "common"
-        "lib/i18n_module"
-        "lib/libcrypt"
-        "lib/libm"
-        "lib/libpthread"
-        "lib/libresolv"
-        "lib/librpcsvc"
-        "lib/librt"
-        "lib/libutil"
-        "libexec/ld.elf_so"
-        "sys"
-      ];
 
       libc = self.callPackage ./pkgs/libc.nix {
         inherit (self) headers csu librt;
diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
index 1965c966cb9a..10431eb64048 100644
--- a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
+++ b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
@@ -11,7 +11,6 @@
   netbsdSetupHook,
   makeMinimal,
   rsync,
-  _mainLibcExtraPaths,
   version,
 }:
 
@@ -134,6 +133,6 @@ mkDerivation (
       "external/bsd/flex"
       "sys"
       "common/include/rpc/types.h"
-    ] ++ _mainLibcExtraPaths;
+    ];
   }
 )
diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix
index d6b14445acd4..8f86691a4413 100644
--- a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix
+++ b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix
@@ -2,7 +2,6 @@
   lib,
   mkDerivation,
   defaultMakeFlags,
-  _mainLibcExtraPaths,
   bsdSetupHook,
   netbsdSetupHook,
   makeMinimal,
@@ -28,7 +27,20 @@ mkDerivation {
   path = "lib/libc";
   USE_FORT = "yes";
   MKPROFILE = "no";
-  extraPaths = _mainLibcExtraPaths ++ [ "external/bsd/jemalloc" ];
+  extraPaths = [
+    "common"
+    "lib/i18n_module"
+    "lib/libcrypt"
+    "lib/libm"
+    "lib/libpthread"
+    "lib/libresolv"
+    "lib/librpcsvc"
+    "lib/librt"
+    "lib/libutil"
+    "libexec/ld.elf_so"
+    "sys"
+    "external/bsd/jemalloc"
+  ];
   nativeBuildInputs = [
     bsdSetupHook
     netbsdSetupHook