diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index 2d162b616316..501b333f9cdb 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -33,20 +33,22 @@ buildClient ? true, buildServer ? true, SDL2, - useSDL2 ? true, + sdl3, + # Use SDL3 (experimental) instead of SDL2 + useSdl3 ? false, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "luanti"; - version = "5.14.0"; + version = "5.15.0"; src = fetchFromGitHub { owner = "luanti-org"; repo = "luanti"; tag = finalAttrs.version; - hash = "sha256-y4Bnlq3nE2u4PN0VPyBP31YORrG6LPPoSb7T5i9JnVM="; + hash = "sha256-ooZyyVFbf8OreYYs3XZlTht10cpdzsRgbOUWyaqX4jw="; }; patches = [ @@ -69,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_SERVER" buildServer) (lib.cmakeBool "BUILD_UNITTESTS" (finalAttrs.finalPackage.doCheck or false)) (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer) - (lib.cmakeBool "USE_SDL2" useSDL2) + (lib.cmakeBool "USE_SDL3" useSdl3) # Ensure we use system libraries (lib.cmakeBool "ENABLE_SYSTEM_GMP" true) (lib.cmakeBool "ENABLE_SYSTEM_JSONCPP" true) @@ -77,14 +79,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_UPDATE_CHECKER" false) # ...but make it clear that this is a nix package (lib.cmakeFeature "VERSION_EXTRA" "NixOS") - - # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed - (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") - (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "share") - (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/doc/luanti") - (lib.cmakeFeature "CMAKE_INSTALL_MANDIR" "share/man") - (lib.cmakeFeature "CMAKE_INSTALL_LOCALEDIR" "share/locale") - ]; nativeBuildInputs = [ @@ -116,9 +110,7 @@ stdenv.mkDerivation (finalAttrs: { openal libogg libvorbis - ] - ++ lib.optionals (buildClient && useSDL2) [ - SDL2 + (if useSdl3 then sdl3 else SDL2) ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin) [ xorg.libX11