Merge pull request #334206 from sysedwinistrator/minetest-5.9.0

pkgs/development/libraries/irrlichtmt/default.nix

@@ -1,52 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, zlib
-, libpng
-, libjpeg
-, libGL
-, libX11
-, libXi
-, libXext
-, Cocoa
-, Kernel
-}:
-stdenv.mkDerivation (finalAttrs: {
-  pname = "irrlichtmt";
-  version = "1.9.0mt13";
-
-  src = fetchFromGitHub {
-    owner = "minetest";
-    repo = "irrlicht";
-    rev = finalAttrs.version;
-    hash = "sha256-BlQd7zbpvQnxqLv3IaHWrXzJ1pJFbQQ3DNWDAj14/YY=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  buildInputs = [
-    zlib
-    libpng
-    libjpeg
-    libGL
-  ] ++ (if stdenv.hostPlatform.isDarwin then [
-    Cocoa
-    Kernel
-  ] else [
-    libX11
-    libXi
-    libXext
-  ]);
-
-  outputs = [ "out" "dev" ];
-
-  meta = {
-    homepage = "https://github.com/minetest/irrlicht";
-    license = lib.licenses.zlib;
-    maintainers = with lib.maintainers; [ DeeUnderscore ];
-    description = "Minetest project's fork of Irrlicht, a realtime 3D engine written in C++";
-  };
-})

pkgs/games/minetest/default.nix

@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , gitUpdater
 , cmake
-, irrlichtmt
 , coreutils
 , libpng
 , bzip2
@@ -15,7 +14,6 @@
 , openal
 , libvorbis
 , sqlite
-, lua5_1
 , luajit
 , freetype
 , gettext
@@ -29,37 +27,35 @@
 , postgresql
 , hiredis
 , libiconv
-, zlib
-, libXrandr
-, libX11
 , ninja
 , prometheus-cpp
-, mesa
 , OpenGL
 , OpenAL ? openal
 , Carbon
 , Cocoa
-, withTouchSupport ? false
+, Kernel
 , buildClient ? true
 , buildServer ? true
+, SDL2
+, useSDL2 ? false
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "minetest";
-  version = "5.8.0";
+  version = "5.9.0";
 
   src = fetchFromGitHub {
     owner = "minetest";
     repo = "minetest";
     rev = finalAttrs.version;
-    hash = "sha256-Oct8nQORSH8PjYs+gHU9QrKObMfapjAlGvycj+AJnOs=";
+    hash = "sha256-cxbiuoD1J3WFoveUgxeR/XXdE7MMR0UEDFleDiaxnsA=";
   };
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_CLIENT" buildClient)
     (lib.cmakeBool "BUILD_SERVER" buildServer)
     (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer)
-    (lib.cmakeBool "ENABLE_TOUCH" withTouchSupport)
+    (lib.cmakeBool "USE_SDL2" useSDL2)
     # Ensure we use system libraries
     (lib.cmakeBool "ENABLE_SYSTEM_GMP" true)
     (lib.cmakeBool "ENABLE_SYSTEM_JSONCPP" true)
@@ -85,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    irrlichtmt
     jsoncpp
     gettext
     freetype
@@ -97,12 +92,12 @@ stdenv.mkDerivation (finalAttrs: {
     libspatialindex
   ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    mesa # for <KHR/khrplatform.h>
     libiconv
     OpenGL
     OpenAL
     Carbon
     Cocoa
+    Kernel
   ] ++ lib.optionals buildClient [
     libpng
     libjpeg
@@ -110,8 +105,11 @@ stdenv.mkDerivation (finalAttrs: {
     openal
     libogg
     libvorbis
-  ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin) [
+  ] ++ lib.optionals (buildClient && useSDL2) [
+    SDL2
+  ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [
     xorg.libX11
+    xorg.libXi
   ] ++ lib.optionals buildServer [
     leveldb
     postgresql

pkgs/top-level/aliases.nix

@@ -680,6 +680,7 @@ mapAliases ({
   ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27
   ipfs-migrator = kubo-migrator; # Added 2022-09-27
   iproute = iproute2; # moved from top-level 2021-03-14
+  irrlichtmt = throw "irrlichtmt has been removed because it was moved into the Minetest repo"; # Added 2024-08-12
   iso-flags-png-320x420 = lib.warn "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17
 
   ### J ###
@@ -947,6 +948,7 @@ mapAliases ({
   miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08
   miopen-opencl = throw "'miopen-opencl' has been replaced with 'rocmPackages.miopen-opencl'"; # Added 2023-10-08
   mime-types = mailcap; # Added 2022-01-21
+  minetest-touch = minetestclient; # Added 2024-08-12
   minetestclient_5 = minetestclient; # Added 2023-12-11
   minetestserver_5 = minetestserver; # Added 2023-12-11
   minizip2 = pkgs.minizip-ng; # Added 2022-12-28

pkgs/top-level/all-packages.nix

@@ -20960,10 +20960,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL IOKit;
   };
 
-  irrlichtmt = callPackage ../development/libraries/irrlichtmt {
-    inherit  (darwin.apple_sdk.frameworks) Cocoa Kernel;
-  };
-
   isocodes = callPackage ../development/libraries/iso-codes { };
 
   iso-flags = callPackage ../data/icons/iso-flags { };
@@ -36046,10 +36042,9 @@ with pkgs;
   moon-buggy = callPackage ../games/moon-buggy { };
 
   minetest = callPackage ../games/minetest {
-    inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa;
+    inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel;
   };
   minetestclient = minetest.override { buildServer = false; };
-  minetest-touch = minetest.override { buildServer = false; withTouchSupport = true; };
   minetestserver = minetest.override { buildClient = false; };
 
   mnemosyne = callPackage ../games/mnemosyne {