Unverified Commit e93e4f99 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

ldmud: various build fixes (#360262)

parents 2ff10d2a 04704adc

pkgs/games/ldmud/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
, libiconv

, pcre

, libgcrypt

, libxcrypt

, libxcrypt-legacy

, json_c

, libxml2

, ipv6Support ? false
@@ -37,11 +37,13 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA=";

  };



  patches = [ ./libxml2-2.12.0-compat.patch ./mysql-compat.patch ];



  sourceRoot = "${src.name}/src";



  nativeBuildInputs =

    [ autoreconfHook pkg-config bison ];

  buildInputs = [ libgcrypt libxcrypt pcre json_c libxml2 ]

  buildInputs = [ libgcrypt libxcrypt-legacy pcre json_c libxml2 ]

    ++ lib.optional mccpSupport zlib ++ lib.optional mysqlSupport libmysqlclient

    ++ lib.optional postgresSupport libpq

    ++ lib.optional sqliteSupport sqlite ++ lib.optional tlsSupport openssl

pkgs/games/ldmud/libxml2-2.12.0-compat.patch

0 → 100644
+18 −0
Original line number Diff line number Diff line 
diff --git src/pkg-xml2.c src/pkg-xml2.c

index 048ca38c..9ea4de35 100644

--- src/pkg-xml2.c

+++ src/pkg-xml2.c

@@ -507,8 +507,13 @@ f_xml_generate (svalue_t *sp)

     return sp;

 }

 

+#if LIBXML_VERSION >= 21200

+static void

+xml_pkg_error_handler(void * userData, const xmlError *error)

+#else

 static void

 xml_pkg_error_handler(void * userData, xmlErrorPtr error)

+#endif

 {

     if (error)

     {

pkgs/games/ldmud/mysql-compat.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git src/autoconf/configure.ac src/autoconf/configure.ac

index 156e97f4..6d70bf33 100644

--- src/autoconf/configure.ac

+++ src/autoconf/configure.ac

@@ -1410,7 +1410,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

 #include <mysql.h>

 #include <errmsg.h>

 

-struct MYSQL * foo(void)

+struct st_mysql * foo(void)

 {

     static MYSQL var;