devolutionx: 1.0.1 -> unstable-2020-10-20
Set devilutionx to commit 432fbc8e that fixes build with dynamic SDL2. Disable failing devilutionx build on darwin.
This commit is contained in:
parent
7d0ba0850f
commit
8479a427cd
|
@ -1,13 +1,13 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
|
{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.0.1";
|
version = "2020-10-20";
|
||||||
pname = "devilutionx";
|
pname = "devilutionx-unstable";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "diasurgical";
|
owner = "diasurgical";
|
||||||
repo = "devilutionX";
|
repo = "devilutionX";
|
||||||
rev = version;
|
rev = "432fbc8ef7b98e567b08e44ce91b198374a5ff01";
|
||||||
sha256 = "1jvjlch9ql5s5jx9g5y5pkc2xn62199qylsmzpqzx1jc3k2vmw5i";
|
sha256 = "03w3bgmzwsbycx3fzvn47fsmabl069gw77yn2fqg89wlgaw1yrr9";
|
||||||
};
|
};
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = [
|
NIX_CFLAGS_COMPILE = [
|
||||||
|
@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
|
||||||
''-DTTF_FONT_PATH="${placeholder "out"}/share/fonts/truetype/CharisSILB.ttf"''
|
''-DTTF_FONT_PATH="${placeholder "out"}/share/fonts/truetype/CharisSILB.ttf"''
|
||||||
];
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DBINARY_RELEASE=ON"
|
||||||
|
];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config cmake ];
|
nativeBuildInputs = [ pkg-config cmake ];
|
||||||
buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ];
|
buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ];
|
||||||
|
|
||||||
|
@ -40,6 +46,6 @@ stdenv.mkDerivation rec {
|
||||||
longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game.";
|
longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game.";
|
||||||
license = licenses.unlicense;
|
license = licenses.unlicense;
|
||||||
maintainers = [ maintainers.karolchmist ];
|
maintainers = [ maintainers.karolchmist ];
|
||||||
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;
|
platforms = platforms.linux ++ platforms.windows;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue