From 9135ad098d535fd4252fd0ce8d2432509ef96af2 Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Sun, 17 Apr 2022 16:13:40 +0200
Subject: [PATCH] man-db: fix after rebase

---
 pkgs/tools/misc/man-db/default.nix         | 20 ++++++++++++++------
 pkgs/tools/misc/man-db/fix-configure.patch | 13 -------------
 2 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/tools/misc/man-db/fix-configure.patch

diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index 93cc57de44d..4f08f9e63b8 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,4 +1,17 @@
-{ lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages, nixosTests }:
+{ buildPackages
+, db
+, fetchurl
+, groff
+, lib
+, libiconv
+, libpipeline
+, makeWrapper
+, nixosTests
+, pkg-config
+, stdenv
+, zstd
+, autoreconfHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "man-db";
@@ -50,12 +63,7 @@ stdenv.mkDerivation rec {
     "ac_cv_func_mempcpy=no"
   ];
 
-
   preConfigure = ''
-    # deal with autoconf 2.70 bug: https://lists.gnu.org/archive/html/bug-autoconf/2020-12/msg00036.html
-    # can be removed once autoconf 2.71 is merged
-    patch < ${./fix-configure.patch}
-
     configureFlagsArray+=("--with-sections=1 n l 8 3 0 2 5 4 9 6 7")
   '';
 
diff --git a/pkgs/tools/misc/man-db/fix-configure.patch b/pkgs/tools/misc/man-db/fix-configure.patch
deleted file mode 100644
index 5c528de9f04..00000000000
--- a/pkgs/tools/misc/man-db/fix-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure	2021-04-29 09:58:14.430422095 +0000
-+++ configure	2021-04-29 09:58:46.783454349 +0000
-@@ -6018,8 +6018,9 @@
-   return 0;
- }
- _ACEOF
-+
-+ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
- for ac_arg in '' ac_prog_cc_stdc=c89
--		       ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
- do
-   CC="$ac_save_CC $ac_arg"
-   if ac_fn_c_try_compile "$LINENO"