swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

netbsd.statHook: init

Browse source 
This fixes the build of various NetBSD programs on Linux,
e.g. netbsd.statHook.
This commit is contained in:
Alyssa Ross 2021-04-15 01:29:11 +00:00
parent e7adc44bb8
commit 3b5b199012
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/os-specific/bsd/netbsd/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, bison, flex { stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, bison, flex
, writeText, buildPackages, splicePackages, symlinkJoin }: , makeSetupHook, writeText, buildPackages, splicePackages, symlinkJoin }:
let let
fetchNetBSD = path: version: sha256: fetchcvs { fetchNetBSD = path: version: sha256: fetchcvs {
@ -30,7 +30,7 @@ let
extraPaths = [ ]; extraPaths = [ ];
nativeBuildInputs = [ makeMinimal install tsort lorder mandoc groff stat ]; nativeBuildInputs = [ makeMinimal install tsort lorder mandoc groff statHook ];
buildInputs = [ compat ]; buildInputs = [ compat ];
# depsBuildBuild = [ buildPackages.stdenv.cc ]; # depsBuildBuild = [ buildPackages.stdenv.cc ];
@ -243,6 +243,7 @@ let
]; ];
}; };
# Don't add this to nativeBuildInputs directly. Use statHook instead.
stat = mkDerivation { stat = mkDerivation {
path = "usr.bin/stat"; path = "usr.bin/stat";
version = "8.0"; version = "8.0";
@ -250,6 +251,17 @@ let
nativeBuildInputs = [ makeMinimal install mandoc groff ]; nativeBuildInputs = [ makeMinimal install mandoc groff ];
}; };
# stat isn't in POSIX, and NetBSD stat supports a completely
# different range of flags than GNU stat, so including it in PATH
# breaks stdenv. Work around that with a hook that will point
# NetBSD's build system and NetBSD stat without including it in
# PATH.
statHook = makeSetupHook {
name = "netbsd-stat-hook";
} (writeText "netbsd-stat-hook-impl" ''
makeFlagsArray+=(TOOL_STAT=${netbsd.stat}/bin/stat)
'');
tsort = mkDerivation { tsort = mkDerivation {
path = "usr.bin/tsort"; path = "usr.bin/tsort";
version = "8.0"; version = "8.0";
@ -563,7 +575,7 @@ let
sha256 = "0630lbvz6v4ic13bfg8ccwfhqkgcv76bfdw9f36rfsnwfgpxqsmq"; sha256 = "0630lbvz6v4ic13bfg8ccwfhqkgcv76bfdw9f36rfsnwfgpxqsmq";
meta.platforms = lib.platforms.netbsd; meta.platforms = lib.platforms.netbsd;
nativeBuildInputs = [ makeMinimal install mandoc groff flex nativeBuildInputs = [ makeMinimal install mandoc groff flex
bison genassym gencat lorder tsort stat ]; bison genassym gencat lorder tsort statHook ];
extraPaths = [ sys.src ld_elf_so.src ]; extraPaths = [ sys.src ld_elf_so.src ];
}; };
@ -587,7 +599,7 @@ let
librpcsvc.src libutil.src librt.src libcrypt.src ]; librpcsvc.src libutil.src librt.src libcrypt.src ];
buildInputs = [ buildPackages.netbsd.headers csu ]; buildInputs = [ buildPackages.netbsd.headers csu ];
nativeBuildInputs = [ makeMinimal install mandoc groff flex nativeBuildInputs = [ makeMinimal install mandoc groff flex
bison genassym gencat lorder tsort stat ]; bison genassym gencat lorder tsort statHook ];
NIX_CFLAGS_COMPILE = "-B${csu}/lib"; NIX_CFLAGS_COMPILE = "-B${csu}/lib";
meta.platforms = lib.platforms.netbsd; meta.platforms = lib.platforms.netbsd;
SHLIBINSTALLDIR = "$(out)/lib"; SHLIBINSTALLDIR = "$(out)/lib";