diff options
author | John Ericson <git@JohnEricson.me> | 2021-04-18 14:45:37 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-18 14:45:37 -0400 |
commit | 3ad122f494ce2fa3b704da3483dcd2c4a7ae7d49 (patch) | |
tree | 9e6d5d3ea84c6e7f0f8974fc741a666c23174a93 /pkgs/os-specific/bsd | |
parent | f42b75df030fa42763d264db3956e1af175d915f (diff) | |
parent | bdb8ec0ce6223a4cb81ba0a396d4aa777683ab07 (diff) | |
download | nixpkgs-3ad122f494ce2fa3b704da3483dcd2c4a7ae7d49.tar nixpkgs-3ad122f494ce2fa3b704da3483dcd2c4a7ae7d49.tar.gz nixpkgs-3ad122f494ce2fa3b704da3483dcd2c4a7ae7d49.tar.bz2 nixpkgs-3ad122f494ce2fa3b704da3483dcd2c4a7ae7d49.tar.lz nixpkgs-3ad122f494ce2fa3b704da3483dcd2c4a7ae7d49.tar.xz nixpkgs-3ad122f494ce2fa3b704da3483dcd2c4a7ae7d49.tar.zst nixpkgs-3ad122f494ce2fa3b704da3483dcd2c4a7ae7d49.zip |
Merge pull request #119793 from alyssais/netbsd-sys
netbsd.sys: fix build
Diffstat (limited to 'pkgs/os-specific/bsd')
-rw-r--r-- | pkgs/os-specific/bsd/netbsd/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/builder.sh b/pkgs/os-specific/bsd/netbsd/builder.sh index 925001567f7..332e5c2098f 100644 --- a/pkgs/os-specific/bsd/netbsd/builder.sh +++ b/pkgs/os-specific/bsd/netbsd/builder.sh @@ -105,9 +105,10 @@ moveUsrDir() { if [ -d $prefix ]; then # Remove lingering /usr references if [ -d $prefix/usr ]; then - cd $prefix/usr + pushd $prefix/usr find . -type d -exec mkdir -p $out/\{} \; find . \( -type f -o -type l \) -exec mv \{} $out/\{} \; + popd fi find $prefix -type d -empty -delete diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 439138c0a21..910e5044c59 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -379,6 +379,13 @@ let (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 ## @@ -410,9 +417,11 @@ let version = "8.0"; sha256 = "123ilg8fqmp69bw6bs6nh98fpi1v2n9lamrzar61p27ji6sj7g0w"; propagatedBuildInputs = [ include ]; - #meta.platforms = lib.platforms.netbsd; + nativeBuildInputs = [ makeMinimal install tsort lorder statHook uudecode ]; + meta.platforms = lib.platforms.netbsd; extraPaths = [ common.src ]; MKKMOD = "no"; + makeFlags = [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; }; headers = symlinkJoin { |