From 5f49a8dfe8df18267030c35af9f95c403959bde0 Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Sat, 13 Mar 2021 01:24:54 +0900
Subject: [PATCH 1/2] Revert "Revert "findutils: 4.7.0 -> 4.8.0""

This reverts commit 4acf7fd6bc131f0d36ab2353db0a8c9fccc00855.
---
 pkgs/tools/misc/findutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 18881ef181d2..9b55a4a86b8a 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "findutils";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchurl {
     url = "mirror://gnu/findutils/${pname}-${version}.tar.xz";
-    sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5";
+    sha256 = "0r3i72hnw0a30khlczi9k2c51aamaj6kfmp5mk3844nrjxz7n4jp";
   };
 
   postPatch = ''

From c85ce73a2c6010cfee63bc75a86c2bb56a9bc4b9 Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Sat, 13 Mar 2021 01:46:06 +0900
Subject: [PATCH 2/2] findutils: fix darwin build

---
 pkgs/tools/misc/findutils/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 9b55a4a86b8a..57839f730562 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -43,6 +43,12 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var/cache"
   ];
 
+  CFLAGS = [
+    # TODO: Revisit upstream issue https://savannah.gnu.org/bugs/?59972
+    # https://github.com/Homebrew/homebrew-core/pull/69761#issuecomment-770268478
+    "-D__nonnull\\(params\\)="
+  ];
+
   enableParallelBuilding = true;
 
   meta = {