Unverified Commit 5faab298 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #246660 from reckenrode/xmlstarlet-fix 

xmlstarlet: fix build with clang 16
parents 358232e6 62ddedb4

pkgs/tools/text/xml/xmlstarlet/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -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}

pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- 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;