cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #119793 from alyssais/netbsd-sys

Browse source 
netbsd.sys: fix build
This commit is contained in:
John Ericson 2021-04-18 14:45:37 -04:00 committed by GitHub
commit 3ad122f494
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/os-specific/bsd/netbsd/builder.sh
View file

@ -105,9 +105,10 @@ moveUsrDir() {
if [ -d $prefix ]; then if [ -d $prefix ]; then
# Remove lingering /usr references # Remove lingering /usr references
if [ -d $prefix/usr ]; then if [ -d $prefix/usr ]; then
cd $prefix/usr pushd $prefix/usr
find . -type d -exec mkdir -p $out/\{} \; find . -type d -exec mkdir -p $out/\{} \;
find . \( -type f -o -type l \) -exec mv \{} $out/\{} \; find . \( -type f -o -type l \) -exec mv \{} $out/\{} \;
popd
fi fi
find $prefix -type d -empty -delete find $prefix -type d -empty -delete

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

@ -379,6 +379,13 @@ let
(fetchNetBSD "tools/Makefile.host" "8.0" "1p23dsc4qrv93vc6gzid9w2479jwswry9qfn88505s0pdd7h6nvp") (fetchNetBSD "tools/Makefile.host" "8.0" "1p23dsc4qrv93vc6gzid9w2479jwswry9qfn88505s0pdd7h6nvp")
]; ];
}; };
uudecode = mkDerivation {
path = "usr.bin/uudecode";
version = "8.0";
sha256 = "00a3zmh15pg4vx6hz0kaa5mi8d2b1sj4h512d7p6wbvxq6mznwcn";
NIX_CFLAGS_COMPILE = lib.optional stdenv.isLinux "-DNO_BASE64";
};
## ##
## END COMMAND LINE TOOLS ## END COMMAND LINE TOOLS
## ##
@ -410,9 +417,11 @@ let
version = "8.0"; version = "8.0";
sha256 = "123ilg8fqmp69bw6bs6nh98fpi1v2n9lamrzar61p27ji6sj7g0w"; sha256 = "123ilg8fqmp69bw6bs6nh98fpi1v2n9lamrzar61p27ji6sj7g0w";
propagatedBuildInputs = [ include ]; propagatedBuildInputs = [ include ];
#meta.platforms = lib.platforms.netbsd; nativeBuildInputs = [ makeMinimal install tsort lorder statHook uudecode ];
meta.platforms = lib.platforms.netbsd;
extraPaths = [ common.src ]; extraPaths = [ common.src ];
MKKMOD = "no"; MKKMOD = "no";
makeFlags = [ "FIRMWAREDIR=$(out)/libdata/firmware" ];
}; };
headers = symlinkJoin { headers = symlinkJoin {