diff options
| author | Orivej Desh <orivej@gmx.fr> | 2021-01-06 08:32:03 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2021-01-06 08:32:03 +0000 |
| commit | 1e0feb654508ad1ec82af2860e0ee9ea623d18dc (patch) | |
| tree | fdff62f8527935bb67b5192ceee2f2059741fc5d /pkgs/games | |
| parent | daa511e42296a7d5857e4d1718880d1f25a22522 (diff) | |
endless-sky: fix build with gcc10
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/endless-sky/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 76ab6542a7f3..cfcbcde6efd1 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , SDL2, libpng, libjpeg, glew, openal, scons, libmad }: @@ -17,6 +17,15 @@ stdenv.mkDerivation { sha256 = "1hly68ljm7yv01jfxyr7g6jivhj0igg6xx7vi92zqymick0hlh7a"; }; + patches = [ + (fetchpatch { + name = "endless-sky-gcc10.patch"; + url = "https://github.com/endless-sky/endless-sky/commit/bc3cab5992694547f9c6c067b5579ef06224781b.patch"; + sha256 = "0v3913jyzhh1d81dxv738kcd3xhh7mrl06qnmj7a3ya2xd9pq4dk"; + }) + ./fixes.patch + ]; + enableParallelBuilding = true; buildInputs = [ @@ -25,10 +34,6 @@ stdenv.mkDerivation { prefixKey = "PREFIX="; - patches = [ - ./fixes.patch - ]; - meta = with stdenv.lib; { description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control"; homepage = "https://endless-sky.github.io/"; |