diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2022-09-24 08:39:33 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2022-09-24 08:39:33 +0100 |
commit | c6b52733b8dd8c81bc6d12842ddd36935d8e6538 (patch) | |
tree | d00998d1828250e437de5cbeadd6f98887dd80c2 /pkgs/games/dxx-rebirth | |
parent | 78fa74ccd19336bd52fc07bab1da1ab1594bcd3e (diff) |
ddx-rebirth: 0.59.20200202 -> unstable-2022-09-17
Fixes build by switching to default compiler.
While at it moved over to SDL2.
Diffstat (limited to 'pkgs/games/dxx-rebirth')
-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 c2e3fac7e15d..f949cf69835d 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" |