summaryrefslogtreecommitdiffstats
path: root/pkgs/games/devilutionx
diff options
context:
space:
mode:
authorKarol Chmist <info+github@chmist.com>2020-10-25 09:18:42 +0100
committerKarol Chmist <info+github@chmist.com>2021-04-04 22:42:41 +0200
commit8479a427cd92378e4fb665a950875153e6c7260c (patch)
tree363ab1e330678ae1fcbf14e58242e785c62900bc /pkgs/games/devilutionx
parent7d0ba0850fe9f0a520c6c8fb2f5db8f71f323627 (diff)
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.
Diffstat (limited to 'pkgs/games/devilutionx')
-rw-r--r--pkgs/games/devilutionx/default.nix16
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
index 73968b515649..1e88907cc17d 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/pkgs/games/devilutionx/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
stdenv.mkDerivation rec {
- version = "1.0.1";
- pname = "devilutionx";
+ version = "2020-10-20";
+ pname = "devilutionx-unstable";
src = fetchFromGitHub {
owner = "diasurgical";
repo = "devilutionX";
- rev = version;
- sha256 = "1jvjlch9ql5s5jx9g5y5pkc2xn62199qylsmzpqzx1jc3k2vmw5i";
+ rev = "432fbc8ef7b98e567b08e44ce91b198374a5ff01";
+ sha256 = "03w3bgmzwsbycx3fzvn47fsmabl069gw77yn2fqg89wlgaw1yrr9";
};
NIX_CFLAGS_COMPILE = [
@@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
''-DTTF_FONT_PATH="${placeholder "out"}/share/fonts/truetype/CharisSILB.ttf"''
];
+ cmakeFlags = [
+ "-DBINARY_RELEASE=ON"
+ ];
+
+ enableParallelBuilding = true;
+
nativeBuildInputs = [ pkg-config cmake ];
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.";
license = licenses.unlicense;
maintainers = [ maintainers.karolchmist ];
- platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;
+ platforms = platforms.linux ++ platforms.windows;
};
}