b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

minetest: 5.5.1 -> 5.6.0

Browse source
This commit is contained in:
Danielle Hutzley 2022-08-11 12:52:16 -07:00 committed by Franz Pletz
parent 2f5ba67aad
commit 39f6700619
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/libraries/irrlichtmt/default.nix
View file

@ -16,13 +16,13 @@
}:
stdenv.mkDerivation rec {
pname = "irrlichtmt";
version = "1.9.0mt5";
version = "1.9.0mt7";
src = fetchFromGitHub {
owner = "minetest";
repo = "irrlicht";
rev = version;
sha256 = "sha256-ocsO4nKab2YxHY1qqZbF4OErpBKmG4V+psgC40APs8s=";
sha256 = "sha256-Eu7zW3mXl7GPRmLnKjt/dPoZ64HPYulI7MO1dJfj+10=";
};
nativeBuildInputs = [
@ -30,9 +30,11 @@ stdenv.mkDerivation rec {
];
# https://github.com/minetest/minetest/pull/10729
postPatch = lib.optionalString withTouchSupport ''
substituteInPlace include/IrrCompileConfig.h \
--replace '//#define _IRR_LINUX_X11_XINPUT2_' '#define _IRR_LINUX_X11_XINPUT2_'
postPatch = lib.optionalString (!withTouchSupport) ''
sed -i '1i #define NO_IRR_LINUX_X11_XINPUT2_' include/IrrCompileConfig.h
# HACK: Fix mistake in build script
sed -i '/''${X11_Xi_LIB}/d' source/Irrlicht/CMakeLists.txt
'';
buildInputs = [

12
pkgs/games/minetest/default.nix
View file

@ -132,12 +132,14 @@ let
};
v5 = {
version = "5.5.1";
sha256 = "sha256-ssaDy6tYxhXGZ1+05J5DwoKYnfhKIKtZj66DOV84WxA=";
dataSha256 = "sha256-SI6I1wXbB0CgTmIemm3VY9DNnWMoI5bt/hqRwHlUl4k=";
version = "5.6.0";
sha256 = "sha256-wcbYcVHs4L0etOwUBjKvzsmZtnpOxpFgLV8nx3UfJQI=";
dataSha256 = "sha256-TVaDHYstFEuT0nBExwLE1PtM1CZh71t9CRxC9rEYTd4=";
};
mkClient = version: generic (version // { buildClient = true; buildServer = false; });
mkServer = version: generic (version // { buildClient = false; buildServer = true; });
in {
minetestclient_5 = generic (v5 // { buildClient = true; buildServer = false; });
minetestserver_5 = generic (v5 // { buildClient = false; buildServer = true; });
minetestclient_5 = mkClient v5;
minetestserver_5 = mkServer v5;
}