@@ -1,5 +1,25 @@
1−{ fetchFromGitHub, lib, stdenv, wrapQtAppsHook, git, pcre, pugixml, qtbase, libsForQt5, libsecret, qtmultimedia, qttools, yajl, libzip, hunspell
2−, boost, libGLU, lua, cmake, which, pkg-config, }:
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, cmake
5+, git
6+, pkg-config
7+, qttools
8+, which
9+, wrapQtAppsHook
10+, boost
11+, hunspell
12+, libGLU
13+, libsForQt5
14+, libsecret
15+, libzip
16+, lua
17+, pcre
18+, pugixml
19+, qtbase
20+, qtmultimedia
21+, yajl
22+}:
323
424let
525 luaEnv = lua.withPackages(ps: with ps; [
@@ -8,25 +28,46 @@ let
828in
929stdenv.mkDerivation rec {
1030 pname = "mudlet";
11− version = "4.12.0";
31+ version = "4.15.1";
1232
1333 src = fetchFromGitHub {
1434 owner = "Mudlet";
1535 repo = "Mudlet";
1636 rev = "Mudlet-${version}";
1737 fetchSubmodules = true;
18− sha256 = "023plm5mwm15xikmdh1mq3gx1n7y4a0r0kw9fvk3rvm9brm78hzp";
38+ hash = "sha256-GnTQc0Jh4YaQnfy7fYsTCACczlzWCQ+auKYoU9ET83M=";
1939 };
2040
21− nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook git qttools which ];
41+ nativeBuildInputs = [
42+ cmake
43+ git
44+ pkg-config
45+ qttools
46+ which
47+ wrapQtAppsHook
48+ ];
49+
2250 buildInputs = [
23− pcre pugixml qtbase libsForQt5.qtkeychain qtmultimedia luaEnv libsecret libzip libGLU yajl boost hunspell
51+ boost
52+ hunspell
53+ libGLU
54+ libsForQt5.qtkeychain
55+ libsecret
56+ libzip
57+ luaEnv
58+ pcre
59+ pugixml
60+ qtbase
61+ qtmultimedia
62+ yajl
2463 ];
2564
2665 WITH_FONTS = "NO";
2766 WITH_UPDATER = "NO";
2867
2968 installPhase = ''
69+ runHook preInstall
70+
3071 mkdir -pv $out/lib
3172 cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog.so $out/lib
3273 mkdir -pv $out/bin
@@ -41,15 +82,19 @@ stdenv.mkDerivation rec {
4182 cp -r ../mudlet.png $out/share/pixmaps/
4283
4384 makeQtWrapper $out/mudlet $out/bin/mudlet \
85+ --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
86+ --prefix LUA_PATH : "$NIX_LUA_PATH" \
4487 --prefix LD_LIBRARY_PATH : "${libsForQt5.qtkeychain}/lib/" \
4588 --run "cd $out";
89+
90+ runHook postInstall
4691 '';
4792
4893 meta = with lib; {
4994 description = "Crossplatform mud client";
50− homepage = "https://mudlet.org";
95+ homepage = "https://www.mudlet.org/";
5196 maintainers = [ maintainers.wyvie maintainers.pstn ];
5297 platforms = platforms.linux;
53− license = licenses.gpl2;
98+ license = licenses.gpl2Plus;
5499 };
55100}