diff options
author | Peter Hoeg <peter@hoeg.com> | 2018-03-07 11:56:33 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2018-03-07 12:35:28 +0800 |
commit | 2e2063074d8445efdbddbb732441d2ea490d0572 (patch) | |
tree | 05c5d385906857913406dd75ae0739af23c1d502 /pkgs/games/dxx-rebirth | |
parent | dc1e064612ed2fee3e1ae428453641485ad8b759 (diff) |
dxx-rebirth: fix compilation with gcc7
Diffstat (limited to 'pkgs/games/dxx-rebirth')
-rw-r--r-- | pkgs/games/dxx-rebirth/default.nix | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index cea07d873ab48..3b05ed142929a 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, scons, pkgconfig +{ stdenv, fetchurl, fetchpatch, scons, pkgconfig , SDL, SDL_mixer, libGLU_combined, physfs }: @@ -17,12 +17,34 @@ in stdenv.mkDerivation rec { 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 ]; buildInputs = [ libGLU_combined physfs SDL SDL_mixer ]; enableParallelBuilding = true; + buildPhase = '' + runHook preBuild + + scons prefix=$out + + runHook postBuild + ''; + installPhase = '' runHook preInstall @@ -37,7 +59,7 @@ in stdenv.mkDerivation rec { description = "Source Port of the Descent 1 and 2 engines"; homepage = http://www.dxx-rebirth.com/; license = licenses.free; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ viric peterhoeg ]; platforms = with platforms; linux; }; } |