From c9b9378674d6c75c5c190da56e66a04bdc80258b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 28 May 2023 09:40:12 -0400 Subject: [PATCH] libidn2: drop Darwin error patch This patch is no longer needed to build libidn2 on Darwin, which can use the implementation of `error` from gnulib. This fixes compliation with clang 16, which fails due to other uses of implicity-declared `error` that it rejects (due to the removal of `#include "error.h"` in the patch). --- .../development/libraries/libidn2/default.nix | 2 -- .../libraries/libidn2/fix-error-darwin.patch | 20 ------------------- 2 files changed, 22 deletions(-) delete mode 100644 pkgs/development/libraries/libidn2/fix-error-darwin.patch diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 2c4041a9cfa7d..0782f94f41e5b 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { # Beware: non-bootstrap libidn2 is overridden by ./hack.nix outputs = [ "bin" "dev" "out" "info" "devdoc" ]; - patches = lib.optional stdenv.isDarwin ./fix-error-darwin.patch; - enableParallelBuilding = true; # The above patch causes the documentation to be regenerated, so the diff --git a/pkgs/development/libraries/libidn2/fix-error-darwin.patch b/pkgs/development/libraries/libidn2/fix-error-darwin.patch deleted file mode 100644 index e2202abd947c4..0000000000000 --- a/pkgs/development/libraries/libidn2/fix-error-darwin.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/idn2.c b/src/idn2.c -index 6abbc72..804f0f2 100644 ---- a/src/idn2.c -+++ b/src/idn2.c -@@ -31,7 +31,6 @@ - #include - - /* Gnulib headers. */ --#include "error.h" - #include "gettext.h" - #define _(String) dgettext (PACKAGE, String) - #include "progname.h" -@@ -222,7 +219,7 @@ main (int argc, char *argv[]) - } - - if (ferror (stdin)) -- error (EXIT_FAILURE, errno, "%s", _("input error")); -+ perror (_("input error")); - - cmdline_parser_free (&args_info);