netbsd: No _mainLibcExtraPaths
These didn't actually affect `netbsd.compat`, so I inlined the variable back to `libc` again.
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
netbsdSetupHook,
|
||||
makeMinimal,
|
||||
rsync,
|
||||
_mainLibcExtraPaths,
|
||||
version,
|
||||
}:
|
||||
|
||||
@@ -134,6 +133,6 @@ mkDerivation (
|
||||
"external/bsd/flex"
|
||||
"sys"
|
||||
"common/include/rpc/types.h"
|
||||
] ++ _mainLibcExtraPaths;
|
||||
];
|
||||
}
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user