From 89e044737697d6000c40d7c0ce22f30cc4d9bea7 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 15 Aug 2022 11:25:23 +0200 Subject: [PATCH] minetest: cleanup * remove unused libraries https://dev.minetest.net/Changelog#5.5.0_.E2.86.92_5.6.0 "Remove direct OpenGL(ES) dependency" * remove IRRLICHTMC_INCLUDE_DIR it is now autodetected * remove unused OpenGL_GL_PREFERENCE=GLVND --- pkgs/games/minetest/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 4bc2e24329ea..36ab2bfe58d3 100644 --- a/pkgs/games/minetest/default.nix +++ b/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 ];