nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-13 17:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

netbsd: No _mainLibcExtraPaths

Browse Source 
These didn't actually affect `netbsd.compat`, so I inlined the variable
back to `libc` again.

(cherry picked from commit 80d3b5dbf9)
This commit is contained in:
John Ericson 2024-06-18 17:57:33 -04:00 committed by github-actions[bot]
parent 731b0bdecd
commit 7eace5c915
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -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;

3
pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
View File

@ -11,7 +11,6 @@
netbsdSetupHook,
makeMinimal,
rsync,
_mainLibcExtraPaths,
version,
}:
@ -134,6 +133,6 @@ mkDerivation (
"external/bsd/flex"
"sys"
"common/include/rpc/types.h"
] ++ _mainLibcExtraPaths;
];
}
)

16
pkgs/os-specific/bsd/netbsd/pkgs/libc.nix
View File

@ -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