minetest: 5.9.1 -> 5.10.0

Diff: https://github.com/minetest/minetest/compare/5.9.1...5.10.0

authored by 06kellyjac and committed by Francesco Gazzetta c006b91a 11676f8a

+31 -11
+13
pkgs/games/minetest/0000-mark-rm-for-substitution.patch
··· 1 + diff --git a/src/filesys.cpp b/src/filesys.cpp 2 + index 8881eb2ca..e02d87a9f 100644 3 + --- a/src/filesys.cpp 4 + +++ b/src/filesys.cpp 5 + @@ -384,7 +384,7 @@ bool RecursiveDelete(const std::string &path) 6 + if (child_pid == 0) { 7 + // Child 8 + std::array<const char*, 4> argv = { 9 + - "rm", 10 + + "@RM_COMMAND@", 11 + "-rf", 12 + path.c_str(), 13 + nullptr
+18 -11
pkgs/games/minetest/default.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 gitUpdater, 6 + substitute, 6 7 cmake, 7 8 coreutils, 8 9 libpng, ··· 43 44 44 45 stdenv.mkDerivation (finalAttrs: { 45 46 pname = "minetest"; 46 - version = "5.9.1"; 47 + version = "5.10.0"; 47 48 48 49 src = fetchFromGitHub { 49 50 owner = "minetest"; 50 51 repo = "minetest"; 51 52 rev = finalAttrs.version; 52 - hash = "sha256-0WTDhFt7GDzN4AK8U17iLkjeSMK+gOWZRq46HBTeO3w="; 53 + hash = "sha256-sumwm8mJghpSriVflMQSHQM4BTmAhfI/Wl/FroLTVts="; 53 54 }; 55 + 56 + patches = [ 57 + (substitute { 58 + src = ./0000-mark-rm-for-substitution.patch; 59 + substitutions = [ 60 + "--subst-var-by" 61 + "RM_COMMAND" 62 + "${coreutils}/bin/rm" 63 + ]; 64 + }) 65 + ]; 66 + 67 + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' 68 + sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt 69 + ''; 54 70 55 71 cmakeFlags = [ 56 72 (lib.cmakeBool "BUILD_CLIENT" buildClient) ··· 124 140 hiredis 125 141 prometheus-cpp 126 142 ]; 127 - 128 - postPatch = 129 - '' 130 - substituteInPlace src/filesys.cpp \ 131 - --replace-fail "/bin/rm" "${coreutils}/bin/rm" 132 - '' 133 - + lib.optionalString stdenv.hostPlatform.isDarwin '' 134 - sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt 135 - ''; 136 143 137 144 postInstall = 138 145 lib.optionalString stdenv.hostPlatform.isLinux ''