diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-27 00:07:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-27 00:07:09 +0000 |
| commit | d645d61d7ac45cfe11f8dfb6428b057dd605d727 (patch) | |
| tree | c55a27b35f325a11551d7c2a9087cfd4f6c25b26 /pkgs/games | |
| parent | 1676502912251e2de17cabc12a1ad3346980c7a3 (diff) | |
| parent | 088eead34aa975dbd76c36d9a85c539d188551e0 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/dxx-rebirth/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index c2e3fac7e15db..f949cf69835d6 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -4,8 +4,9 @@ , fetchpatch , scons , pkg-config -, SDL -, SDL_mixer +, SDL2 +, SDL2_image +, SDL2_mixer , libGLU , libGL , libpng @@ -21,21 +22,23 @@ let in stdenv.mkDerivation rec { pname = "dxx-rebirth"; - version = "0.59.20200202"; + version = "unstable-2022-09-17"; src = fetchFromGitHub { owner = "dxx-rebirth"; repo = "dxx-rebirth"; - rev = "8ebb66c5c9c74ebb93d49741cc9545f2bb7fa05d"; - sha256 = "1lsrlp47aby2m9hh7i3nv5rb0srlkmnq1w2ca6vyvlga9m9h7jrk"; + rev = "ad46235b67a24a38dec4734f94a59eba149ad94a"; + hash = "sha256-vIAY1O4VnOsV617J5yjg09JIL/vK4Fb/lopnX17g+uY="; }; nativeBuildInputs = [ pkg-config scons ]; - buildInputs = [ libGLU libGL libpng physfs SDL SDL_mixer ]; + buildInputs = [ libGLU libGL libpng physfs SDL2 SDL2_image SDL2_mixer ]; enableParallelBuilding = true; + sconsFlags = [ "sdl2=1" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-format-nonliteral" "-Wno-format-truncation" |