From f5b089b626baa2dcd5560ad77e250fc58a307621 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 3 Nov 2021 15:50:01 +0000 Subject: [PATCH] netbsd: add missing rsync native build inputs Using extraPaths in NetBSD packages now requires rsync, but the rsync dependency wasn't added to all the packages using extraPaths that override nativeBuildInputs, so they'd just fail immediately. Fixes: 75db7f8eb04 ("netbsd: Use rsync to speed up source merging") --- pkgs/os-specific/bsd/netbsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 8f24d28409f9..5fd9bbc51a0f 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -508,7 +508,7 @@ in lib.makeScopeWithSplicing nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook makeMinimal - install mandoc groff nbperf + install mandoc groff nbperf rsync ]; makeFlags = defaultMakeFlags ++ [ "TOOLDIR=$(out)" ]; extraPaths = with self; [ @@ -674,7 +674,7 @@ in lib.makeScopeWithSplicing nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook makeMinimal - byacc install tsort lorder mandoc statHook + byacc install tsort lorder mandoc statHook rsync ]; buildInputs = with self; [ headers ]; SHLIBINSTALLDIR = "$(out)/lib"; @@ -707,7 +707,7 @@ in lib.makeScopeWithSplicing sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook - makeMinimal install tsort lorder mandoc statHook nbperf tic + makeMinimal install tsort lorder mandoc statHook nbperf tic rsync ]; buildInputs = with self; compatIfNeeded; SHLIBINSTALLDIR = "$(out)/lib";