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

dxx-rebirth: fix compilation with gcc7

Browse Source
This commit is contained in:
Peter Hoeg 2018-03-07 11:56:33 +08:00
parent dc1e064612
commit 2e2063074d
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, scons, pkgconfig { stdenv, fetchurl, fetchpatch, scons, pkgconfig
, SDL, SDL_mixer, libGLU_combined, physfs , SDL, SDL_mixer, libGLU_combined, physfs
}: }:
@ -17,12 +17,34 @@ in stdenv.mkDerivation rec {
sha256 = "0m9k34zyr8bbni9szip407mffdpwbqszgfggavgqjwq0k9c1w7ka"; sha256 = "0m9k34zyr8bbni9szip407mffdpwbqszgfggavgqjwq0k9c1w7ka";
}; };
# TODO: drop these when upgrading to version > 0.59.100
patches = [
(fetchpatch {
name = "dxx-gcc7-fix1.patch";
url = "https://github.com/dxx-rebirth/dxx-rebirth/commit/1ed7cec714c623758e3418ec69eaf3b3ff03e9f6.patch";
sha256 = "026pn8xglmxryaj8555h5rhzkx30lxmksja1fzdlfyb1vll75gq0";
})
(fetchpatch {
name = "dxx-gcc7-fix2.patch";
url = "https://github.com/dxx-rebirth/dxx-rebirth/commit/73057ad8ec6977ac747637db1080686f11b4c3cc.patch";
sha256 = "0s506vdd2djrrm3xl0ygn9ylpg6y8qxii2nnzk3sf9133glp3swy";
})
];
nativeBuildInputs = [ pkgconfig scons ]; nativeBuildInputs = [ pkgconfig scons ];
buildInputs = [ libGLU_combined physfs SDL SDL_mixer ]; buildInputs = [ libGLU_combined physfs SDL SDL_mixer ];
enableParallelBuilding = true; enableParallelBuilding = true;
buildPhase = ''
runHook preBuild
scons prefix=$out
runHook postBuild
'';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -37,7 +59,7 @@ in stdenv.mkDerivation rec {
description = "Source Port of the Descent 1 and 2 engines"; description = "Source Port of the Descent 1 and 2 engines";
homepage = http://www.dxx-rebirth.com/; homepage = http://www.dxx-rebirth.com/;
license = licenses.free; license = licenses.free;
maintainers = with maintainers; [ viric ]; maintainers = with maintainers; [ viric peterhoeg ];
platforms = with platforms; linux; platforms = with platforms; linux;
}; };
} }