colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #192721 from trofi/ddx-rebirth-gcc-fix

Browse Source 
ddx-rebirth: 0.59.20200202 -> unstable-2022-09-17
This commit is contained in:
Sergei Trofimovich 2022-09-26 21:34:06 +01:00 committed by GitHub
commit 30133410c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/games/dxx-rebirth/default.nix
View File

@ -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"

3
pkgs/top-level/all-packages.nix
View File

@ -33414,8 +33414,7 @@ with pkgs;
dwarf-therapist = dwarf-fortress-packages.dwarf-therapist;
dxx-rebirth = callPackage ../games/dxx-rebirth
{ stdenv = gcc10StdenvCompat; physfs = physfs_2; };
dxx-rebirth = callPackage ../games/dxx-rebirth { };
inherit (callPackages ../games/dxx-rebirth/assets.nix { })
descent1-assets