minetest: 5.9.1 -> 5.10.0

Diff: https://github.com/minetest/minetest/compare/5.9.1...5.10.0
This commit is contained in:
06kellyjac
2024-12-24 22:58:39 +00:00
committed by Francesco Gazzetta
parent 11676f8aa9
commit c006b91a85
2 changed files with 31 additions and 11 deletions
@@ -0,0 +1,13 @@
diff --git a/src/filesys.cpp b/src/filesys.cpp
index 8881eb2ca..e02d87a9f 100644
--- a/src/filesys.cpp
+++ b/src/filesys.cpp
@@ -384,7 +384,7 @@ bool RecursiveDelete(const std::string &path)
if (child_pid == 0) {
// Child
std::array<const char*, 4> argv = {
- "rm",
+ "@RM_COMMAND@",
"-rf",
path.c_str(),
nullptr
+18 -11
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
gitUpdater,
substitute,
cmake,
coreutils,
libpng,
@@ -43,15 +44,30 @@
stdenv.mkDerivation (finalAttrs: {
pname = "minetest";
version = "5.9.1";
version = "5.10.0";
src = fetchFromGitHub {
owner = "minetest";
repo = "minetest";
rev = finalAttrs.version;
hash = "sha256-0WTDhFt7GDzN4AK8U17iLkjeSMK+gOWZRq46HBTeO3w=";
hash = "sha256-sumwm8mJghpSriVflMQSHQM4BTmAhfI/Wl/FroLTVts=";
};
patches = [
(substitute {
src = ./0000-mark-rm-for-substitution.patch;
substitutions = [
"--subst-var-by"
"RM_COMMAND"
"${coreutils}/bin/rm"
];
})
];
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt
'';
cmakeFlags = [
(lib.cmakeBool "BUILD_CLIENT" buildClient)
(lib.cmakeBool "BUILD_SERVER" buildServer)
@@ -125,15 +141,6 @@ stdenv.mkDerivation (finalAttrs: {
prometheus-cpp
];
postPatch =
''
substituteInPlace src/filesys.cpp \
--replace-fail "/bin/rm" "${coreutils}/bin/rm"
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt
'';
postInstall =
lib.optionalString stdenv.hostPlatform.isLinux ''
patchShebangs $out