Merge staging-next into staging

2022-10-19 00:05:44 +00:00 · 2022-10-19 00:05:44 +00:00 · 1323172b83
parent 110ec00516 a25e03e76a
commit 1323172b83
1 changed files with 5 additions and 1 deletions
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@ -297,7 +297,11 @@ in lib.makeScopeWithSplicing
      mandoc groff rsync
    ];
    skipIncludesPhase = true;
-    buildInputs = with self; compatIfNeeded;
+    buildInputs = with self; compatIfNeeded
+      # fts header is needed. glibc already has this header, but musl doesn't,
+      # so make sure pkgsMusl.netbsd.install still builds in case you want to
+      # remove it!
+      ++ [ fts ];
    installPhase = ''
      runHook preInstall