diff --git a/packages/c/corrade/xmake.lua b/packages/c/corrade/xmake.lua
index 12abce734..73de2dd89 100644
--- a/packages/c/corrade/xmake.lua
+++ b/packages/c/corrade/xmake.lua
@@ -23,6 +23,8 @@ package("corrade")
     end)
 
     on_install("windows", "linux", "macosx", function (package)
+        io.replace("src/Corrade/Utility/StlForwardTuple.h", "__tuple", "tuple")
+
         local configs = {"-DBUILD_TESTS=OFF", "-DLIB_SUFFIX="}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DCORRADE_BUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON"))
diff --git a/packages/m/magnum-integration/xmake.lua b/packages/m/magnum-integration/xmake.lua
index cdfbf4105..a85010b82 100644
--- a/packages/m/magnum-integration/xmake.lua
+++ b/packages/m/magnum-integration/xmake.lua
@@ -26,7 +26,7 @@ package("magnum-integration")
         end
     end)
 
-    on_install("windows", "linux", "macosx|x86_64", function (package)
+    on_install("windows", "linux", "macosx", function (package)
         local configs = {"-DBUILD_TESTS=OFF", "-DLIB_SUFFIX="}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON"))
diff --git a/packages/m/magnum/xmake.lua b/packages/m/magnum/xmake.lua
index 7abb54433..26aec7835 100644
--- a/packages/m/magnum/xmake.lua
+++ b/packages/m/magnum/xmake.lua
@@ -72,7 +72,7 @@ package("magnum")
         end
     end)
 
-    on_install("windows", "linux", "macosx|x86_64", function (package)
+    on_install("windows", "linux", "macosx", function (package)
         io.replace("modules/FindSDL2.cmake", "SDL2-2.0 SDL2", "SDL2-2.0 SDL2 SDL2-static", {plain = true})
         io.replace("modules/FindSDL2.cmake", "${_SDL2_LIBRARY_PATH_SUFFIX}", "lib ${_SDL2_LIBRARY_PATH_SUFFIX}", {plain = true})
         local configs = {"-DBUILD_TESTS=OFF", "-DLIB_SUFFIX="}