diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
| commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
| tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/games/minetest | |
| parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
| parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
| download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip | |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/games/minetest')
| -rw-r--r-- | nixpkgs/pkgs/games/minetest/default.nix | 15 | ||||
| -rw-r--r-- | nixpkgs/pkgs/games/minetest/disable_fixup.patch | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/games/minetest/fix_wordsize_confusion.patch | 10 |
3 files changed, 29 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/games/minetest/default.nix b/nixpkgs/pkgs/games/minetest/default.nix index f286c359e6fc..03c1cb5cc4ab 100644 --- a/nixpkgs/pkgs/games/minetest/default.nix +++ b/nixpkgs/pkgs/games/minetest/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp , libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit -, freetype, gettext, doxygen, ncurses, graphviz, xorg -, leveldb, postgresql, hiredis +, freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex +, leveldb, postgresql, hiredis, libiconv, OpenGL, OpenAL ? openal, Carbon, Cocoa }: with stdenv.lib; @@ -39,13 +39,16 @@ let ] ++ optionals buildClient [ "-DOpenGL_GL_PREFERENCE=GLVND" ]; - + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 nativeBuildInputs = [ cmake doxygen graphviz ]; buildInputs = [ irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses + gmp libspatialindex + ] ++ optionals stdenv.isDarwin [ + libiconv OpenGL OpenAL Carbon Cocoa ] ++ optionals buildClient [ libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm ] ++ optionals buildServer [ @@ -61,7 +64,7 @@ let homepage = http://minetest.net/; description = "Infinite-world block sandbox game"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pyrolagus fpletz ]; }; }; @@ -73,8 +76,8 @@ let }; v5 = { - version = "5.1.0"; - sha256 = "184n9gxfa7yr0j85z2x736maaymsnppd5jzm326wlqri3c0qqy3z"; + version = "5.1.1"; + sha256 = "0cjj63333b7j4ydfq0h9yc6d2jvmyjd7n7zbd08yrf0rcibrj2k0"; dataSha256 = "1r9fxz2j24q74a9injvbxbf2xk67fzabv616i676zw2cvgv9hn39"; }; diff --git a/nixpkgs/pkgs/games/minetest/disable_fixup.patch b/nixpkgs/pkgs/games/minetest/disable_fixup.patch new file mode 100644 index 000000000000..1c378d7f83fc --- /dev/null +++ b/nixpkgs/pkgs/games/minetest/disable_fixup.patch @@ -0,0 +1,10 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -802,7 +802,6 @@ + install(CODE " + set(BU_CHMOD_BUNDLE_ITEMS ON) + include(BundleUtilities) +- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${BUNDLE_PATH}\" \"\" \"\${CMAKE_INSTALL_PREFIX}/${BINDIR}\") + " COMPONENT Runtime) + endif() + diff --git a/nixpkgs/pkgs/games/minetest/fix_wordsize_confusion.patch b/nixpkgs/pkgs/games/minetest/fix_wordsize_confusion.patch new file mode 100644 index 000000000000..9540a434dafe --- /dev/null +++ b/nixpkgs/pkgs/games/minetest/fix_wordsize_confusion.patch @@ -0,0 +1,10 @@ +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -17,6 +17,7 @@ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#include <cstdint> + #include "irrlicht.h" // createDevice + #include "irrlichttypes_extrabloated.h" + #include "chat_interface.h" |