diff --git a/pkgs/development/libraries/irrlichtmt/default.nix b/pkgs/development/libraries/irrlichtmt/default.nix index e40f2c84b2af..e7537404f09c 100644 --- a/pkgs/development/libraries/irrlichtmt/default.nix +++ b/pkgs/development/libraries/irrlichtmt/default.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation rec { pname = "irrlichtmt"; - version = "1.9.0mt4"; + version = "1.9.0mt5"; src = fetchFromGitHub { owner = "minetest"; repo = "irrlicht"; rev = version; - sha256 = "sha256-YlXn9LrfGkjdb8+zQGDgrInolUYj9nVSF2AXWFpEEkw="; + sha256 = "sha256-ocsO4nKab2YxHY1qqZbF4OErpBKmG4V+psgC40APs8s="; }; nativeBuildInputs = [ diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 2a1039901f38..ed6b2deda509 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,8 +1,44 @@ -{ lib, stdenv, fetchFromGitHub, cmake, irrlichtmt, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit -, freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex -, leveldb, postgresql, hiredis, libiconv, zlib, libXrandr, libX11, ninja, prometheus-cpp -, OpenGL, OpenAL ? openal, Carbon, Cocoa, withTouchSupport ? false +{ lib +, stdenv +, fetchFromGitHub +, cmake +, irrlichtmt +, coreutils +, libpng +, bzip2 +, curl +, libogg +, jsoncpp +, libjpeg +, libXxf86vm +, libGLU +, libGL +, openal +, libvorbis +, sqlite +, luajit +, freetype +, gettext +, doxygen +, ncurses +, graphviz +, xorg +, gmp +, libspatialindex +, leveldb +, postgresql +, hiredis +, libiconv +, zlib +, libXrandr +, libX11 +, ninja +, prometheus-cpp +, OpenGL +, OpenAL ? openal +, Carbon +, Cocoa +, withTouchSupport ? false }: with lib; @@ -72,9 +108,14 @@ let leveldb postgresql hiredis prometheus-cpp ]; + postPatch = '' + substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm" + ''; + postInstall = '' mkdir -pv $out/share/minetest/games/minetest_game/ cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ + patchShebangs $out ''; meta = with lib; { @@ -91,9 +132,9 @@ let }; v5 = { - version = "5.5.0"; - sha256 = "sha256-V+ggqvZibSQrJbrtNCEkmRYHhgSKTQsdBh3c8+t6WeA="; - dataSha256 = "sha256-6ZS3EET3nm09eL0czCGadwzon35/EBfAg2KjPX3ZP/0="; + version = "5.5.1"; + sha256 = "sha256-ssaDy6tYxhXGZ1+05J5DwoKYnfhKIKtZj66DOV84WxA="; + dataSha256 = "sha256-SI6I1wXbB0CgTmIemm3VY9DNnWMoI5bt/hqRwHlUl4k="; }; in {