pyrox.dev
minetest: 5.5.1 -> 5.6.0
authored by Danielle Hutzley and committed by Franz Pletz 39f67006 2f5ba67a
+7
-5
pkgs/development/libraries/irrlichtmt/default.nix
+7
-5
pkgs/development/libraries/irrlichtmt/default.nix
···
16
16
}:
17
17
stdenv.mkDerivation rec {
18
18
pname = "irrlichtmt";
19
-
version = "1.9.0mt5";
19
+
version = "1.9.0mt7";
20
20
21
21
src = fetchFromGitHub {
22
22
owner = "minetest";
23
23
repo = "irrlicht";
24
24
rev = version;
25
-
sha256 = "sha256-ocsO4nKab2YxHY1qqZbF4OErpBKmG4V+psgC40APs8s=";
25
+
sha256 = "sha256-Eu7zW3mXl7GPRmLnKjt/dPoZ64HPYulI7MO1dJfj+10=";
26
26
};
27
27
28
28
nativeBuildInputs = [
···
30
30
];
31
31
32
32
# https://github.com/minetest/minetest/pull/10729
33
-
postPatch = lib.optionalString withTouchSupport ''
34
-
substituteInPlace include/IrrCompileConfig.h \
35
-
--replace '//#define _IRR_LINUX_X11_XINPUT2_' '#define _IRR_LINUX_X11_XINPUT2_'
33
+
postPatch = lib.optionalString (!withTouchSupport) ''
34
+
sed -i '1i #define NO_IRR_LINUX_X11_XINPUT2_' include/IrrCompileConfig.h
35
+
36
+
# HACK: Fix mistake in build script
37
+
sed -i '/''${X11_Xi_LIB}/d' source/Irrlicht/CMakeLists.txt
36
38
'';
37
39
38
40
buildInputs = [
+7
-5
pkgs/games/minetest/default.nix
+7
-5
pkgs/games/minetest/default.nix
···
132
132
};
133
133
134
134
v5 = {
135
-
version = "5.5.1";
136
-
sha256 = "sha256-ssaDy6tYxhXGZ1+05J5DwoKYnfhKIKtZj66DOV84WxA=";
137
-
dataSha256 = "sha256-SI6I1wXbB0CgTmIemm3VY9DNnWMoI5bt/hqRwHlUl4k=";
135
+
version = "5.6.0";
136
+
sha256 = "sha256-wcbYcVHs4L0etOwUBjKvzsmZtnpOxpFgLV8nx3UfJQI=";
137
+
dataSha256 = "sha256-TVaDHYstFEuT0nBExwLE1PtM1CZh71t9CRxC9rEYTd4=";
138
138
};
139
139
140
+
mkClient = version: generic (version // { buildClient = true; buildServer = false; });
141
+
mkServer = version: generic (version // { buildClient = false; buildServer = true; });
140
142
in {
141
-
minetestclient_5 = generic (v5 // { buildClient = true; buildServer = false; });
142
-
minetestserver_5 = generic (v5 // { buildClient = false; buildServer = true; });
143
+
minetestclient_5 = mkClient v5;
144
+
minetestserver_5 = mkServer v5;
143
145
}