From 62ddedb4eab4d187a43e6fd72d9bc66a360fb23d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 11 Jul 2023 13:19:02 -0600 Subject: xmlstarlet: fix build with clang 16 Fixes an incompatible function pointer error when building with clang 16. --- pkgs/tools/text/xml/xmlstarlet/default.nix | 5 +++++ .../xml/xmlstarlet/fix-incompatible-function-pointer.patch | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch (limited to 'pkgs/tools') diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index d76e9d144964..8f382d3bcd5d 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 libxslt ]; + patches = [ + # Fixes an incompatible function pointer error with clang 16. + ./fix-incompatible-function-pointer.patch + ]; + preConfigure = '' export LIBXSLT_PREFIX=${libxslt.dev} diff --git a/pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch b/pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch new file mode 100644 index 000000000000..a0818731c217 --- /dev/null +++ b/pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch @@ -0,0 +1,11 @@ +--- a/src/xml_elem.c 2012-08-12 09:18:59.000000000 -0600 ++++ b/src/xml_elem.c 2023-07-11 13:17:14.220809280 -0600 +@@ -186,7 +186,7 @@ + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name; -- cgit 1.4.1