pyrox.dev
ldmud: 3.6.7 -> 3.6.8 (#424458)
authored by Felix Bargfeldt and committed by GitHub 0399d49b 7f7f6743
-18
pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch
-18
pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch
···
1
-
diff --git src/pkg-xml2.c src/pkg-xml2.c
2
-
index 048ca38c..9ea4de35 100644
3
-
--- src/pkg-xml2.c
4
-
+++ src/pkg-xml2.c
5
-
@@ -507,8 +507,13 @@ f_xml_generate (svalue_t *sp)
6
-
return sp;
7
-
}
8
-
9
-
+#if LIBXML_VERSION >= 21200
10
-
+static void
11
-
+xml_pkg_error_handler(void * userData, const xmlError *error)
12
-
+#else
13
-
static void
14
-
xml_pkg_error_handler(void * userData, xmlErrorPtr error)
15
-
+#endif
16
-
{
17
-
if (error)
18
-
{
+16
-12
pkgs/by-name/ld/ldmud/package.nix
+16
-12
pkgs/by-name/ld/ldmud/package.nix
···
26
26
python310,
27
27
}:
28
28
29
-
stdenv.mkDerivation rec {
29
+
stdenv.mkDerivation (finalAttrs: {
30
30
pname = "ldmud";
31
-
version = "3.6.7";
31
+
version = "3.6.8";
32
32
33
33
src = fetchFromGitHub {
34
34
owner = "ldmud";
35
35
repo = "ldmud";
36
-
rev = version;
37
-
sha256 = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA=";
36
+
tag = finalAttrs.version;
37
+
hash = "sha256-ojOLM1vkuwuF0vXx6lCH0+OlyLkkOOnTJEUiZPpUhzo=";
38
38
};
39
39
40
40
patches = [
41
-
./libxml2-2.12.0-compat.patch
42
41
./mysql-compat.patch
43
42
];
44
43
45
-
sourceRoot = "${src.name}/src";
44
+
sourceRoot = "${finalAttrs.src.name}/src";
46
45
47
46
nativeBuildInputs = [
48
47
autoreconfHook
49
48
pkg-config
50
49
bison
51
50
];
51
+
52
52
buildInputs =
53
53
[
54
54
libgcrypt
···
86
86
(lib.enableFeature pythonSupport "use-python")
87
87
];
88
88
89
-
preConfigure = lib.optionalString mysqlSupport ''
90
-
export CPPFLAGS="-I${lib.getDev libmysqlclient}/include/mysql"
91
-
export LDFLAGS="-L${libmysqlclient}/lib/mysql"
92
-
'';
89
+
preConfigure =
90
+
lib.optionalString mysqlSupport ''
91
+
export CPPFLAGS="-I${lib.getDev libmysqlclient}/include/mysql"
92
+
export LDFLAGS="-L${libmysqlclient}/lib/mysql"
93
+
''
94
+
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
95
+
export LDFLAGS="$LDFLAGS -L${libiconv}/lib -liconv"
96
+
'';
93
97
94
98
installTargets = [
95
99
"install-driver"
···
105
109
meta = {
106
110
description = "Gamedriver for LPMuds including a LPC compiler, interpreter and runtime";
107
111
homepage = "https://ldmud.eu";
108
-
changelog = "https://github.com/ldmud/ldmud/blob/${version}/HISTORY";
112
+
changelog = "https://github.com/ldmud/ldmud/blob/${finalAttrs.version}/HISTORY";
109
113
longDescription = ''
110
114
LDMud started as a project to clean up and modernize Amylaar's LPMud
111
115
gamedriver. Primary goals are full documentation, a commented source body
···
120
124
platforms = with lib.platforms; linux ++ darwin;
121
125
maintainers = with lib.maintainers; [ cpu ];
122
126
};
123
-
}
127
+
})