netbsd.libpthread{,-headers}: Inline base.nix

It is just one line and thus not worth factoring out.
This commit is contained in:
John Ericson
2024-06-21 18:38:17 -04:00
parent 0281c72ed3
commit c08bf286c5
3 changed files with 28 additions and 33 deletions
@@ -1 +0,0 @@
{ path = "lib/libpthread"; }
@@ -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;
}
@@ -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;
}