Merge pull request #186771 from fgaz/minetest/cleanup

pkgs/development/libraries/irrlichtmt/default.nix

@@ -7,7 +7,6 @@
 , libjpeg
 , libGL
 , libX11
-, libXxf86vm
 , withTouchSupport ? false
 , libXi
 , libXext
@@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
     libjpeg
     libGL
     libX11
-    libXxf86vm
   ] ++ lib.optionals withTouchSupport [
     libXi
     libXext

pkgs/games/minetest/default.nix

@@ -10,9 +10,7 @@
 , libogg
 , jsoncpp
 , libjpeg
-, libXxf86vm
 , libGLU
-, libGL
 , openal
 , libvorbis
 , sqlite
@@ -75,7 +73,6 @@ let
       "-DENABLE_GETTEXT=1"
       "-DENABLE_SPATIAL=1"
       "-DENABLE_SYSTEM_JSONCPP=1"
-      "-DIRRLICHT_INCLUDE_DIR=${irrlichtmtInput.dev}/include/irrlichtmt"
 
       # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed
       "-DCMAKE_INSTALL_BINDIR=bin"
@@ -85,8 +82,6 @@ let
       "-DCMAKE_INSTALL_MANDIR=share/man"
       "-DCMAKE_INSTALL_LOCALEDIR=share/locale"
 
-    ] ++ optionals buildClient [
-      "-DOpenGL_GL_PREFERENCE=GLVND"
     ] ++ optionals buildServer [
       "-DENABLE_PROMETHEUS=1"
     ] ++ optionals withTouchSupport [
@@ -103,7 +98,7 @@ let
     ] ++ optionals stdenv.isDarwin [
       libiconv OpenGL OpenAL Carbon Cocoa
     ] ++ optionals buildClient [
-      libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm
+      libpng libjpeg libGLU openal libogg libvorbis xorg.libX11
     ] ++ optionals buildServer [
       leveldb postgresql hiredis prometheus-cpp
     ];