alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

minetest: refactor and add dev version 5

Browse source
This commit is contained in:
Franz Pletz 2019-01-10 05:49:12 +01:00
parent a11995a328
commit 4b95e496e1
No known key found for this signature in database
GPG key ID: 846FDED7792617B4
2 changed files with 82 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
pkgs/games/minetest/default.nix
View file

@ -1,22 +1,26 @@
{ stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp
, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, sqlite, luajit
, freetype, gettext, doxygen, ncurses, leveldb
, freetype, gettext, doxygen, ncurses, graphviz, xorg
, leveldb, postgresql, hiredis
}:
with stdenv.lib;
let
version = "0.4.17.1";
boolToCMake = b: if b then "ON" else "OFF";
generic = { version, rev ? version, sha256, dataRev ? version, dataSha256, buildClient ? true, buildServer ? false }: let
sources = {
src = fetchFromGitHub {
owner = "minetest";
repo = "minetest";
rev = "${version}";
sha256 = "19sfblgh9mchkgw32n7gdvm7a8a9jxsl9cdlgmxn9bk9m939a2sg";
inherit rev sha256;
};
data = fetchFromGitHub {
owner = "minetest";
repo = "minetest_game";
rev = "${version}";
sha256 = "1g8iw2pya32ifljbdx6z6rpcinmzm81i9minhi2bi1d500ailn7s";
rev = dataRev;
sha256 = dataSha256;
};
};
in stdenv.mkDerivation {
@ -25,20 +29,26 @@ in stdenv.mkDerivation {
src = sources.src;
cmakeFlags = [
"-DBUILD_CLIENT=${boolToCMake buildClient}"
"-DBUILD_SERVER=${boolToCMake buildServer}"
"-DENABLE_FREETYPE=1"
"-DENABLE_GETTEXT=1"
"-DENABLE_SYSTEM_JSONCPP=1"
"-DGETTEXT_INCLUDE_DIR=${gettext}/include/gettext"
"-DCURL_INCLUDE_DIR=${curl.dev}/include/curl"
"-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
] ++ 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 = [
cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm libGLU_combined
openal libvorbis xlibsWrapper sqlite luajit freetype gettext doxygen ncurses
leveldb
irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses
] ++ optionals buildClient [
libpng libjpeg libGLU_combined openal libogg libvorbis xorg.libX11 libXxf86vm
] ++ optional buildServer [
leveldb postgresql hiredis
];
postInstall = ''
@ -51,6 +61,28 @@ in stdenv.mkDerivation {
description = "Infinite-world block sandbox game";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ jgeerds c0dehero ];
maintainers = with maintainers; [ jgeerds c0dehero fpletz ];
};
};
v4 = {
version = "0.4.17.1";
sha256 = "19sfblgh9mchkgw32n7gdvm7a8a9jxsl9cdlgmxn9bk9m939a2sg";
dataSha256 = "1g8iw2pya32ifljbdx6z6rpcinmzm81i9minhi2bi1d500ailn7s";
};
v5 = {
version = "git-5.0.0-dev-2019-01-08";
rev = "95d4ff6d1b62945decc85003a99588bb0539c45b";
sha256 = "1qn42d2lfgwadb26mix6c7j457zsl8cqqjfwhaa8y34hii1q44bw";
dataRev = "a2c9523bce5bcefdc930ff6f14d6d94f57473be9";
dataSha256 = "1p26zvnmq99cqlrby4294mp2fmp8iqdcjld0ph39x41ifc50lfdf";
};
in {
minetestclient_4 = generic (v4 // { buildClient = true; buildServer = false; });
minetestserver_4 = generic (v4 // { buildClient = false; buildServer = true; });
minetestclient_5 = generic (v5 // { buildClient = true; buildServer = false; });
minetestserver_5 = generic (v5 // { buildClient = false; buildServer = true; });
}

8
pkgs/top-level/all-packages.nix
View file

@ -20757,9 +20757,11 @@ in
multimc = libsForQt5.callPackage ../games/multimc { };
minetest = callPackage ../games/minetest {
libpng = libpng12;
};
inherit (callPackages ../games/minetest { })
minetestclient_4 minetestserver_4
minetestclient_5 minetestserver_5;
minetest = minetestclient_4;
mnemosyne = callPackage ../games/mnemosyne {
python = python3;