Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minetest: 5.8.0 -> 5.9.0 #334206

Merged
merged 3 commits into from
Aug 12, 2024
Merged

minetest: 5.8.0 -> 5.9.0 #334206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d61c03f
minetest: 5.8.0 -> 5.9.0
sysedwinistrator Aug 12, 2024
e9761ca
minetest: add arg for using irrlicht's SDL backend
sysedwinistrator Aug 12, 2024
8739341
irrlichtmt: remove at 1.9.0mt13
sysedwinistrator Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions pkgs/development/libraries/irrlichtmt/default.nix
View file
Open in desktop

This file was deleted.

24 changes: 11 additions & 13 deletions pkgs/games/minetest/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
, fetchFromGitHub
, gitUpdater
, cmake
, irrlichtmt
, coreutils
, libpng
, bzip2
Expand All @@ -15,7 +14,6 @@
, openal
, libvorbis
, sqlite
, lua5_1
, luajit
, freetype
, gettext
Expand All @@ -29,37 +27,35 @@
, postgresql
, hiredis
, libiconv
, zlib
, libXrandr
, libX11
, ninja
, prometheus-cpp
, mesa
fpletz marked this conversation as resolved.
Show resolved Hide resolved
, OpenGL
, OpenAL ? openal
, Carbon
, Cocoa
, withTouchSupport ? false
, Kernel
, buildClient ? true
, buildServer ? true
, SDL2
, useSDL2 ? false
}:

fpletz marked this conversation as resolved.
Show resolved Hide resolved
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)
fpletz marked this conversation as resolved.
Show resolved Hide resolved
# Ensure we use system libraries
(lib.cmakeBool "ENABLE_SYSTEM_GMP" true)
(lib.cmakeBool "ENABLE_SYSTEM_JSONCPP" true)
Expand All @@ -85,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
];

buildInputs = [
irrlichtmt
jsoncpp
gettext
freetype
Expand All @@ -97,21 +92,24 @@ stdenv.mkDerivation (finalAttrs: {
libspatialindex
] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit
++ lib.optionals stdenv.hostPlatform.isDarwin [
mesa # for <KHR/khrplatform.h>
libiconv
OpenGL
OpenAL
Carbon
Cocoa
Kernel
] ++ lib.optionals buildClient [
libpng
libjpeg
libGLU
openal
libogg
libvorbis
] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin) [
] ++ lib.optionals (buildClient && useSDL2) [
SDL2
] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [
xorg.libX11
xorg.libXi
] ++ lib.optionals buildServer [
leveldb
postgresql
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,7 @@ mapAliases ({
ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27
ipfs-migrator = kubo-migrator; # Added 2022-09-27
iproute = iproute2; # moved from top-level 2021-03-14
irrlichtmt = throw "irrlichtmt has been removed because it was moved into the Minetest repo"; # Added 2024-08-12
iso-flags-png-320x420 = lib.warn "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17

### J ###
Expand Down Expand Up @@ -947,6 +948,7 @@ mapAliases ({
miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08
miopen-opencl = throw "'miopen-opencl' has been replaced with 'rocmPackages.miopen-opencl'"; # Added 2023-10-08
mime-types = mailcap; # Added 2022-01-21
minetest-touch = minetestclient; # Added 2024-08-12
minetestclient_5 = minetestclient; # Added 2023-12-11
minetestserver_5 = minetestserver; # Added 2023-12-11
minizip2 = pkgs.minizip-ng; # Added 2022-12-28
Expand Down
7 changes: 1 addition & 6 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20960,10 +20960,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL IOKit;
};

irrlichtmt = callPackage ../development/libraries/irrlichtmt {
inherit (darwin.apple_sdk.frameworks) Cocoa Kernel;
};

fpletz marked this conversation as resolved.
Show resolved Hide resolved
isocodes = callPackage ../development/libraries/iso-codes { };

iso-flags = callPackage ../data/icons/iso-flags { };
Expand Down Expand Up @@ -36046,10 +36042,9 @@ with pkgs;
moon-buggy = callPackage ../games/moon-buggy { };

minetest = callPackage ../games/minetest {
inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa;
inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel;
};
minetestclient = minetest.override { buildServer = false; };
minetest-touch = minetest.override { buildServer = false; withTouchSupport = true; };
minetestserver = minetest.override { buildClient = false; };
fpletz marked this conversation as resolved.
Show resolved Hide resolved

mnemosyne = callPackage ../games/mnemosyne {
Expand Down