From c08bf286c5dcb7463a7db310523456e24ee70b3b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 20 Jun 2024 14:29:55 -0400
Subject: [PATCH] netbsd.libpthread{,-headers}: Inline `base.nix`

It is just one line and thus not worth factoring out.
---
 .../bsd/netbsd/pkgs/libpthread/base.nix       |  1 -
 .../bsd/netbsd/pkgs/libpthread/headers.nix    | 18 ++++----
 .../bsd/netbsd/pkgs/libpthread/package.nix    | 42 +++++++++----------
 3 files changed, 28 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix

diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix
deleted file mode 100644
index 08c298c0fe5d..000000000000
--- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ path = "lib/libpthread"; }
diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix
index c3cc899017ee..41a447e2b408 100644
--- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix
+++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/headers.nix
@@ -1,12 +1,10 @@
 { lib, mkDerivation }:
 
-mkDerivation (
-  import ./base.nix
-  // {
-    pname = "libpthread-headers";
-    installPhase = "includesPhase";
-    dontBuild = true;
-    noCC = true;
-    meta.platforms = lib.platforms.netbsd;
-  }
-)
+mkDerivation {
+  path = "lib/libpthread";
+  pname = "libpthread-headers";
+  installPhase = "includesPhase";
+  dontBuild = true;
+  noCC = true;
+  meta.platforms = lib.platforms.netbsd;
+}
diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix
index 2aa5a8f54066..8e0ef5fd1b74 100644
--- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix
+++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix
@@ -7,31 +7,29 @@
   librt,
 }:
 
-mkDerivation (
-  import ./base.nix
-  // {
+mkDerivation {
+  path = "lib/libpthread";
 
-    libcMinimal = true;
+  libcMinimal = true;
 
-    outputs = [
-      "out"
-      "dev"
-      "man"
-    ];
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
 
-    SHLIBINSTALLDIR = "$(out)/lib";
+  SHLIBINSTALLDIR = "$(out)/lib";
 
-    # Hack around GCC's limits.h missing the include_next we want See
-    # https://gcc.gnu.org/legacy-ml/gcc/2003-10/msg01278.html
-    NIX_CFLAGS_COMPILE_BEFORE = "-isystem ${stdenvLibcMinimal.cc.libc.dev}/include";
+  # Hack around GCC's limits.h missing the include_next we want See
+  # https://gcc.gnu.org/legacy-ml/gcc/2003-10/msg01278.html
+  NIX_CFLAGS_COMPILE_BEFORE = "-isystem ${stdenvLibcMinimal.cc.libc.dev}/include";
 
-    extraPaths = [
-      "common"
-      libcMinimal.path
-      librt.path
-      "sys"
-    ];
+  extraPaths = [
+    "common"
+    libcMinimal.path
+    librt.path
+    "sys"
+  ];
 
-    meta.platforms = lib.platforms.netbsd;
-  }
-)
+  meta.platforms = lib.platforms.netbsd;
+}