diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-06 01:07:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-06 01:07:29 +0200 |
| commit | 5faab29808a2d72f4ee0c44c8e850e4e6ada972f (patch) | |
| tree | d497bf48c7de36f6b7aca8503a8b40ce6d5d4203 /pkgs/tools | |
| parent | 358232e63200c7693194df4efdf8ceececacd8c8 (diff) | |
| parent | 62ddedb4eab4d187a43e6fd72d9bc66a360fb23d (diff) | |
| download | nixlib-5faab29808a2d72f4ee0c44c8e850e4e6ada972f.tar nixlib-5faab29808a2d72f4ee0c44c8e850e4e6ada972f.tar.gz nixlib-5faab29808a2d72f4ee0c44c8e850e4e6ada972f.tar.bz2 nixlib-5faab29808a2d72f4ee0c44c8e850e4e6ada972f.tar.lz nixlib-5faab29808a2d72f4ee0c44c8e850e4e6ada972f.tar.xz nixlib-5faab29808a2d72f4ee0c44c8e850e4e6ada972f.tar.zst nixlib-5faab29808a2d72f4ee0c44c8e850e4e6ada972f.zip | |
Merge pull request #246660 from reckenrode/xmlstarlet-fix
xmlstarlet: fix build with clang 16
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/text/xml/xmlstarlet/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch | 11 |
2 files changed, 16 insertions, 0 deletions
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; |