colobot: Fix build
This commit is contained in:
parent
5f6dd3dd1e
commit
62ca25f181
|
@ -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
|
, glew, gettext, libsndfile, libvorbis, libogg, physfs, openal
|
||||||
, xmlstarlet, doxygen, python3, callPackage }:
|
, xmlstarlet, doxygen, python3, callPackage }:
|
||||||
|
|
||||||
|
@ -18,6 +18,15 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0viq5s4zqs33an7rdmc3anf74ml7mwwcwf60alhvp9hj5jr547s2";
|
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 ];
|
nativeBuildInputs = [ cmake xmlstarlet doxygen python3 ];
|
||||||
buildInputs = [ boost SDL2 SDL2_image SDL2_ttf libpng glew gettext libsndfile libvorbis libogg physfs openal ];
|
buildInputs = [ boost SDL2 SDL2_image SDL2_ttf libpng glew gettext libsndfile libvorbis libogg physfs openal ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue