diff options
| author | Linus Heckemann <git@sphalerite.org> | 2021-12-07 12:38:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 12:38:11 +0100 |
| commit | 066044811030412d5d1df6736096c9ff160214e1 (patch) | |
| tree | 13a0b9696e0db47d7593139177e2f8d065aadedb /pkgs/games | |
| parent | 675eaca77535ae22887a2631581e7eaef8b423db (diff) | |
| parent | 77db4fdd95e4a36035a09f3287f03e4f65a948cc (diff) | |
Merge pull request #145044 from lucc/endless-sky
Endless sky: 0.9.12 -> 0.9.14
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/endless-sky/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 0c9871037f85a..7806ae4906a2e 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -1,27 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , SDL2, libpng, libjpeg, glew, openal, scons, libmad }: stdenv.mkDerivation rec { pname = "endless-sky"; - version = "0.9.12"; + version = "0.9.14"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "1hly68ljm7yv01jfxyr7g6jivhj0igg6xx7vi92zqymick0hlh7a"; + sha256 = "sha256-Vcck+zGcv39DXyhZF2DLUrXq3gDwkgL0NtPT5rVOpHs="; }; patches = [ - (fetchpatch { - name = "endless-sky-gcc10.patch"; - url = "https://github.com/endless-sky/endless-sky/commit/bc3cab5992694547f9c6c067b5579ef06224781b.patch"; - sha256 = "0v3913jyzhh1d81dxv738kcd3xhh7mrl06qnmj7a3ya2xd9pq4dk"; - }) ./fixes.patch ]; + preBuild = '' + export AR="${stdenv.cc.targetPrefix}gcc-ar" + ''; + enableParallelBuilding = true; buildInputs = [ |