diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-05 00:16:38 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-05 00:16:38 +0000 |
commit | 44e3fc61fed2ad05cf1ae7d155172dccd0555465 (patch) | |
tree | 315f09a7c2a0b100b0d50cec9d5d194106bd52c2 /pkgs/games/devilutionx/default.nix | |
parent | 8277f3982e62787e389b6e2875433dd30c0ae39c (diff) | |
parent | 131299a60ff3db9defb1e84ff4cfa41a07e61ecb (diff) | |
download | nixpkgs-44e3fc61fed2ad05cf1ae7d155172dccd0555465.tar nixpkgs-44e3fc61fed2ad05cf1ae7d155172dccd0555465.tar.gz nixpkgs-44e3fc61fed2ad05cf1ae7d155172dccd0555465.tar.bz2 nixpkgs-44e3fc61fed2ad05cf1ae7d155172dccd0555465.tar.lz nixpkgs-44e3fc61fed2ad05cf1ae7d155172dccd0555465.tar.xz nixpkgs-44e3fc61fed2ad05cf1ae7d155172dccd0555465.tar.zst nixpkgs-44e3fc61fed2ad05cf1ae7d155172dccd0555465.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/games/devilutionx/default.nix')
-rw-r--r-- | pkgs/games/devilutionx/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 73968b51564..1e88907cc17 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; }; } |