diff options
Diffstat (limited to 'pkgs/games/minetest/default.nix')
-rw-r--r-- | pkgs/games/minetest/default.nix | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 070cf908fa559..d17be89b47210 100644 --- a/pkgs/games/minetest/default.nix +++ b/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,36 +27,35 @@ , postgresql , hiredis , libiconv -, zlib -, libXrandr -, libX11 , ninja , prometheus-cpp , 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) @@ -84,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - irrlichtmt jsoncpp gettext freetype @@ -95,12 +91,13 @@ stdenv.mkDerivation (finalAttrs: { gmp libspatialindex ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv OpenGL OpenAL Carbon Cocoa + Kernel ] ++ lib.optionals buildClient [ libpng libjpeg @@ -108,7 +105,11 @@ stdenv.mkDerivation (finalAttrs: { openal libogg libvorbis + ] ++ lib.optionals (buildClient && useSDL2) [ + SDL2 + ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [ xorg.libX11 + xorg.libXi ] ++ lib.optionals buildServer [ leveldb postgresql |