diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-03 22:26:26 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-03 22:26:26 +0100 |
| commit | f99888c6e3cc9b30d9807a18c626dea97de9b59f (patch) | |
| tree | 3294537ad78d6aab32fd229258e824fa3fd682c9 /pkgs/tools/text/xml | |
| parent | 307002948de4dd54437293de0d6a629d5478668b (diff) | |
xmlstarlet: fix build on darwin
Diffstat (limited to 'pkgs/tools/text/xml')
| -rw-r--r-- | pkgs/tools/text/xml/xmlstarlet/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 111e95c9508d8..b5eb08199fc61 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , autoreconfHook , pkg-config , libxml2 @@ -20,8 +21,11 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 libxslt ]; patches = [ - # Fixes an incompatible function pointer error with clang 16. - ./fix-incompatible-function-pointer.patch + (fetchpatch { + name = "0001-Fix-build-with-libxml2-2.12.patch"; + url = "https://sourceforge.net/p/xmlstar/patches/_discuss/thread/890e29655a/66ca/attachment/0001-Fix-build-with-libxml2-2.12.patch"; + hash = "sha256-XEk7aFOdrzdec1j2ffERJQbLH0AUNJA52QwA9jf4XWA="; + }) ]; preConfigure = '' diff --git a/pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch b/pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch deleted file mode 100644 index a0818731c217c..0000000000000 --- a/pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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; |