pyrox.dev
Merge pull request #199944 from cpu/cpu.mudlet.4.16.0
mudlet: 4.15.1 -> 4.16.0
authored by Jonas Heinrich and committed by GitHub 940bac2c 90adb9db
+34
-7
pkgs/games/mudlet/default.nix
+34
-7
pkgs/games/mudlet/default.nix
···
18
18
, pugixml
19
19
, qtbase
20
20
, qtmultimedia
21
+
, discord-rpc
21
22
, yajl
22
23
}:
23
24
24
25
let
25
-
luaEnv = lua.withPackages(ps: with ps; [
26
-
luazip luafilesystem lrexlib-pcre luasql-sqlite3 lua-yajl luautf8
26
+
overrideLua =
27
+
let
28
+
packageOverrides = self: super: {
29
+
# luasql-sqlite3 master branch broke compatibility with lua 5.1. Pin to
30
+
# an earlier commit.
31
+
# https://github.com/lunarmodules/luasql/issues/147
32
+
luasql-sqlite3 = super.luaLib.overrideLuarocks super.luasql-sqlite3
33
+
(drv: {
34
+
version = "2.6.0-1-custom";
35
+
src = fetchFromGitHub {
36
+
owner = "lunarmodules";
37
+
repo = "luasql";
38
+
rev = "8c58fd6ee32faf750daf6e99af015a31402578d1";
39
+
hash = "sha256-XlTB5O81yWCrx56m0cXQp7EFzeOyfNeqGbuiYqMrTUk=";
40
+
};
41
+
});
42
+
};
43
+
in
44
+
lua.override { inherit packageOverrides; };
45
+
46
+
luaEnv = overrideLua.withPackages (ps: with ps; [
47
+
luazip
48
+
luafilesystem
49
+
lrexlib-pcre
50
+
luasql-sqlite3
51
+
lua-yajl
52
+
luautf8
27
53
]);
28
54
in
29
55
stdenv.mkDerivation rec {
30
56
pname = "mudlet";
31
-
version = "4.15.1";
57
+
version = "4.16.0";
32
58
33
59
src = fetchFromGitHub {
34
60
owner = "Mudlet";
35
61
repo = "Mudlet";
36
62
rev = "Mudlet-${version}";
37
63
fetchSubmodules = true;
38
-
hash = "sha256-GnTQc0Jh4YaQnfy7fYsTCACczlzWCQ+auKYoU9ET83M=";
64
+
hash = "sha256-HrrEbcMv35IGmYD1L1zmdcpYdFM2PLBEqPY+jMJioTA=";
39
65
};
40
66
41
67
nativeBuildInputs = [
···
60
86
qtbase
61
87
qtmultimedia
62
88
yajl
89
+
discord-rpc
63
90
];
64
91
65
92
cmakeFlags = [
···
70
97
WITH_FONTS = "NO";
71
98
WITH_UPDATER = "NO";
72
99
73
-
installPhase = ''
100
+
installPhase = ''
74
101
runHook preInstall
75
102
76
103
mkdir -pv $out/lib
···
89
116
makeQtWrapper $out/mudlet $out/bin/mudlet \
90
117
--set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
91
118
--prefix LUA_PATH : "$NIX_LUA_PATH" \
92
-
--prefix LD_LIBRARY_PATH : "${libsForQt5.qtkeychain}/lib/" \
119
+
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsForQt5.qtkeychain discord-rpc ]}" \
93
120
--chdir "$out";
94
121
95
122
runHook postInstall
···
98
125
meta = with lib; {
99
126
description = "Crossplatform mud client";
100
127
homepage = "https://www.mudlet.org/";
101
-
maintainers = [ maintainers.wyvie maintainers.pstn ];
128
+
maintainers = with maintainers; [ wyvie pstn cpu ];
102
129
platforms = platforms.linux;
103
130
license = licenses.gpl2Plus;
104
131
};