mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 02:13:23 +00:00
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).
This commit is contained in:
parent
5611fa71ab
commit
c9b9378674
@ -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
|
||||
|
@ -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 <unistr.h>
|
||||
|
||||
/* 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);
|
Loading…
Reference in New Issue
Block a user