git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #73719 from willghatch/endless-sky

endless-sky: 0.9.8 -> 0.9.10

commitff1ead8d4241f788e65ff3594ae620f7e60f59f5 authorLinus Heckemann <git@sphalerite.org> dateTue 19 Nov 2019, 12:20 (7 years ago) parentf82832e4fbb59a
2 files changed+2−11
pkgs/games/endless-sky/default.nix+2−2 pkgs/games/endless-sky/fixes.patch−9
pkgs/games/endless-sky/default.nix+2−2
@@ -3,7 +3,7 @@
33}:
44
55let
6− version = "0.9.8";
6+ version = "0.9.10";
77
88in
99stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414 owner = "endless-sky";
1515 repo = "endless-sky";
1616 rev = "v${version}";
17− sha256 = "0i36lawypikbq8vvzfis1dn7yf6q0d2s1cllshfn7kmjb6pqfi6c";
17+ sha256 = "1wax9qhxakydg6bs92d1jy2fki1n9r0wkps1np02y0pvm1fl189i";
1818 };
1919
2020 enableParallelBuilding = true;
pkgs/games/endless-sky/fixes.patch−9
@@ -2,15 +2,6 @@ diff --git a/SConstruct b/SConstruct
22index 48fd080..419b40d 100644
33--- a/SConstruct
44+++ b/SConstruct
5−@@ -1,7 +1,7 @@
6− import os
7−
8− # Load any environment variables that alter the build.
9−-env = Environment()
10−+env = Environment(ENV = os.environ)
11− if 'CCFLAGS' in os.environ:
12− env.Append(CCFLAGS = os.environ['CCFLAGS'])
13− if 'CXXFLAGS' in os.environ:
145@@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("build/" + env["mode"] + "/*.cpp"))
156
167