From b0fcbeecc6f6fb520d31aa6c27858e033dc04906 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 11 Oct 2024 10:24:30 -0400 Subject: [PATCH] =?UTF-8?q?Revert=20"man-db:=20fix=20test=20failure=20when?= =?UTF-8?q?=20using=20Darwin=E2=80=99s=20libiconv"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ba7af302dc9a9f27f56178de10efbf0d75df8c4a. --- pkgs/tools/misc/man-db/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 2aa3345186a5..68a394044be7 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -46,11 +46,6 @@ stdenv.mkDerivation rec { # Add mandb locations for the above echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # This test fails on Darwin. man-db expects libiconv to skip over the invalid character in the source data, but - # Darwin’s libiconv returns EILSEQ without skipping it. This causes the `manconv` to go into an infinite loop - # because it keeps trying to convert the invalid character. - sed -i '/manconv-odd-combinations/d' src/tests/Makefile.am ''; configureFlags = [