diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/games/endless-sky/default.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/games/endless-sky/default.nix')
-rw-r--r-- | pkgs/games/endless-sky/default.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 76ab6542a7f..0c9871037f8 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -1,14 +1,10 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , SDL2, libpng, libjpeg, glew, openal, scons, libmad }: -let - version = "0.9.12"; - -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "endless-sky"; - inherit version; + version = "0.9.12"; src = fetchFromGitHub { owner = "endless-sky"; @@ -17,6 +13,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,11 +30,7 @@ stdenv.mkDerivation { prefixKey = "PREFIX="; - patches = [ - ./fixes.patch - ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control"; homepage = "https://endless-sky.github.io/"; license = with licenses; [ |