summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2021-07-24 15:07:44 +0200
committerGitHub <noreply@github.com>2021-07-24 15:07:44 +0200
commit372b467c8d60a23af5a75d295f9e2a20c561dd58 (patch)
treef3b7cc28e0cc53f98191609701873dfd68aae862
parentecb8a5b0b043d7281494fea9b45bb974dcaaea42 (diff)
parentc85ce73a2c6010cfee63bc75a86c2bb56a9bc4b9 (diff)
downloadnixpkgs-372b467c8d60a23af5a75d295f9e2a20c561dd58.tar
nixpkgs-372b467c8d60a23af5a75d295f9e2a20c561dd58.tar.gz
nixpkgs-372b467c8d60a23af5a75d295f9e2a20c561dd58.tar.bz2
nixpkgs-372b467c8d60a23af5a75d295f9e2a20c561dd58.tar.lz
nixpkgs-372b467c8d60a23af5a75d295f9e2a20c561dd58.tar.xz
nixpkgs-372b467c8d60a23af5a75d295f9e2a20c561dd58.tar.zst
nixpkgs-372b467c8d60a23af5a75d295f9e2a20c561dd58.zip
Merge pull request #116075 from midchildan/update/findutils
findutils: 4.7.0 -> 4.8.0
-rw-r--r--pkgs/tools/misc/findutils/default.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 18881ef181d..57839f73056 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 = ''
@@ -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 = {