diff options
| author | DavHau <hsngrmpf+github@gmail.com> | 2022-04-17 16:13:40 +0200 |
|---|---|---|
| committer | Yt <raphael@megzari.com> | 2022-04-17 13:22:08 -0400 |
| commit | 9135ad098d535fd4252fd0ce8d2432509ef96af2 (patch) | |
| tree | 251d4159550e5eb1bc5556d0ce38d42783eee5ee /pkgs/tools | |
| parent | 2030ed94c557918af94f3ff3769fbba2c4c0d854 (diff) | |
man-db: fix after rebase
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/man-db/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/tools/misc/man-db/fix-configure.patch | 13 |
2 files changed, 14 insertions, 19 deletions
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 93cc57de44d25..4f08f9e63b8c3 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 5c528de9f04d5..0000000000000 --- 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" |