diff options
| author | Stefan Frijters <sfrijters@gmail.com> | 2021-05-07 19:35:52 +0200 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-07 11:14:40 -0700 |
| commit | 62ca25f181afb82962cbd948c3b28e6dbe4f03ab (patch) | |
| tree | aff836938af3a8634be02f53884f879a54973393 /pkgs/games/colobot | |
| parent | 5f6dd3dd1ecf24eb7776e214640eeda9a01b5dba (diff) | |
colobot: Fix build
Diffstat (limited to 'pkgs/games/colobot')
| -rw-r--r-- | pkgs/games/colobot/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/games/colobot/default.nix b/pkgs/games/colobot/default.nix index 25b91d80f2729..b26244ccc5fde 100644 --- a/pkgs/games/colobot/default.nix +++ b/pkgs/games/colobot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng , glew, gettext, libsndfile, libvorbis, libogg, physfs, openal , xmlstarlet, doxygen, python3, callPackage }: @@ -18,6 +18,15 @@ stdenv.mkDerivation rec { sha256 = "0viq5s4zqs33an7rdmc3anf74ml7mwwcwf60alhvp9hj5jr547s2"; }; + patches = [ + # Fix issue with newer compilers, like used in nixpkgs + # https://github.com/colobot/colobot/pull/1291 + (fetchpatch { + url = "https://github.com/colobot/colobot/commit/fc2bd68876ac6302dbc8e91e8ffa33592db14b21.patch"; + sha256 = "sha256-PKe8jeyHpTT86tprSafQhNqTYBrSonz+r2fL1lVJdfo="; + }) + ]; + nativeBuildInputs = [ cmake xmlstarlet doxygen python3 ]; buildInputs = [ boost SDL2 SDL2_image SDL2_ttf libpng glew gettext libsndfile libvorbis libogg physfs openal ]; |