qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minetest: add arg for using irrlicht's SDL backend

Browse Source 
Irrlicht's SDL device (=backend) was enabled by default for the 5.9.0
pre-release, but was disabled again at the last minute before the
release due to issues reported by some users.

NOTE: the irrlicht device is a compile time option and cannot be
switched at runtime.
This commit is contained in:
Edwin Mackenzie-Owen 2024-08-12 20:35:44 +02:00
parent d61c03fe46
commit e9761ca2ae
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/games/minetest/default.nix
View File

@ -36,6 +36,8 @@
, Kernel , Kernel
, buildClient ? true , buildClient ? true
, buildServer ? true , buildServer ? true
, SDL2
, useSDL2 ? false
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -53,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "BUILD_CLIENT" buildClient) (lib.cmakeBool "BUILD_CLIENT" buildClient)
(lib.cmakeBool "BUILD_SERVER" buildServer) (lib.cmakeBool "BUILD_SERVER" buildServer)
(lib.cmakeBool "ENABLE_PROMETHEUS" buildServer) (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer)
(lib.cmakeBool "USE_SDL2" useSDL2)
# Ensure we use system libraries # Ensure we use system libraries
(lib.cmakeBool "ENABLE_SYSTEM_GMP" true) (lib.cmakeBool "ENABLE_SYSTEM_GMP" true)
(lib.cmakeBool "ENABLE_SYSTEM_JSONCPP" true) (lib.cmakeBool "ENABLE_SYSTEM_JSONCPP" true)
@ -102,7 +105,9 @@ stdenv.mkDerivation (finalAttrs: {
openal openal
libogg libogg
libvorbis libvorbis
] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin) [ ] ++ lib.optionals (buildClient && useSDL2) [
SDL2
] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [
xorg.libX11 xorg.libX11
xorg.libXi xorg.libXi
] ++ lib.optionals buildServer [ ] ++ lib.optionals buildServer [