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
+34 -7
pkgs/games/mudlet/default.nix
··· 18 , pugixml 19 , qtbase 20 , qtmultimedia 21 , yajl 22 }: 23 24 let 25 - luaEnv = lua.withPackages(ps: with ps; [ 26 - luazip luafilesystem lrexlib-pcre luasql-sqlite3 lua-yajl luautf8 27 ]); 28 in 29 stdenv.mkDerivation rec { 30 pname = "mudlet"; 31 - version = "4.15.1"; 32 33 src = fetchFromGitHub { 34 owner = "Mudlet"; 35 repo = "Mudlet"; 36 rev = "Mudlet-${version}"; 37 fetchSubmodules = true; 38 - hash = "sha256-GnTQc0Jh4YaQnfy7fYsTCACczlzWCQ+auKYoU9ET83M="; 39 }; 40 41 nativeBuildInputs = [ ··· 60 qtbase 61 qtmultimedia 62 yajl 63 ]; 64 65 cmakeFlags = [ ··· 70 WITH_FONTS = "NO"; 71 WITH_UPDATER = "NO"; 72 73 - installPhase = '' 74 runHook preInstall 75 76 mkdir -pv $out/lib ··· 89 makeQtWrapper $out/mudlet $out/bin/mudlet \ 90 --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ 91 --prefix LUA_PATH : "$NIX_LUA_PATH" \ 92 - --prefix LD_LIBRARY_PATH : "${libsForQt5.qtkeychain}/lib/" \ 93 --chdir "$out"; 94 95 runHook postInstall ··· 98 meta = with lib; { 99 description = "Crossplatform mud client"; 100 homepage = "https://www.mudlet.org/"; 101 - maintainers = [ maintainers.wyvie maintainers.pstn ]; 102 platforms = platforms.linux; 103 license = licenses.gpl2Plus; 104 };
··· 18 , pugixml 19 , qtbase 20 , qtmultimedia 21 + , discord-rpc 22 , yajl 23 }: 24 25 let 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 53 ]); 54 in 55 stdenv.mkDerivation rec { 56 pname = "mudlet"; 57 + version = "4.16.0"; 58 59 src = fetchFromGitHub { 60 owner = "Mudlet"; 61 repo = "Mudlet"; 62 rev = "Mudlet-${version}"; 63 fetchSubmodules = true; 64 + hash = "sha256-HrrEbcMv35IGmYD1L1zmdcpYdFM2PLBEqPY+jMJioTA="; 65 }; 66 67 nativeBuildInputs = [ ··· 86 qtbase 87 qtmultimedia 88 yajl 89 + discord-rpc 90 ]; 91 92 cmakeFlags = [ ··· 97 WITH_FONTS = "NO"; 98 WITH_UPDATER = "NO"; 99 100 + installPhase = '' 101 runHook preInstall 102 103 mkdir -pv $out/lib ··· 116 makeQtWrapper $out/mudlet $out/bin/mudlet \ 117 --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ 118 --prefix LUA_PATH : "$NIX_LUA_PATH" \ 119 + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsForQt5.qtkeychain discord-rpc ]}" \ 120 --chdir "$out"; 121 122 runHook postInstall ··· 125 meta = with lib; { 126 description = "Crossplatform mud client"; 127 homepage = "https://www.mudlet.org/"; 128 + maintainers = with maintainers; [ wyvie pstn cpu ]; 129 platforms = platforms.linux; 130 license = licenses.gpl2Plus; 131 };