From 62ca25f181afb82962cbd948c3b28e6dbe4f03ab Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 7 May 2021 19:35:52 +0200 Subject: [PATCH] colobot: Fix build --- pkgs/games/colobot/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/games/colobot/default.nix b/pkgs/games/colobot/default.nix index 25b91d80f27..b26244ccc5f 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 ];