diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:01:49 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:01:49 +0100 |
| commit | 65edeb8633de16792a84195f77a6b4ea408e2608 (patch) | |
| tree | be3960fdb869c4d25b8128fb1080810e6ea22756 /pkgs/games | |
| parent | 13bab298fc1ad49db5449b262125d25d849bc90e (diff) | |
| parent | 648152fdbbdbb8a51335b94647ea9f959f42064d (diff) | |
| download | nixpkgs-65edeb8633de16792a84195f77a6b4ea408e2608.tar nixpkgs-65edeb8633de16792a84195f77a6b4ea408e2608.tar.gz nixpkgs-65edeb8633de16792a84195f77a6b4ea408e2608.tar.bz2 nixpkgs-65edeb8633de16792a84195f77a6b4ea408e2608.tar.lz nixpkgs-65edeb8633de16792a84195f77a6b4ea408e2608.tar.xz nixpkgs-65edeb8633de16792a84195f77a6b4ea408e2608.tar.zst nixpkgs-65edeb8633de16792a84195f77a6b4ea408e2608.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/endless-sky/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/endless-sky/fixes.patch | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 14bea8185c6..5d1ed1c11a9 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -3,7 +3,7 @@ }: let - version = "0.9.8"; + version = "0.9.10"; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "0i36lawypikbq8vvzfis1dn7yf6q0d2s1cllshfn7kmjb6pqfi6c"; + sha256 = "1wax9qhxakydg6bs92d1jy2fki1n9r0wkps1np02y0pvm1fl189i"; }; enableParallelBuilding = true; diff --git a/pkgs/games/endless-sky/fixes.patch b/pkgs/games/endless-sky/fixes.patch index cad7a6acaed..359e2ee4af3 100644 --- a/pkgs/games/endless-sky/fixes.patch +++ b/pkgs/games/endless-sky/fixes.patch @@ -2,15 +2,6 @@ diff --git a/SConstruct b/SConstruct index 48fd080..419b40d 100644 --- a/SConstruct +++ b/SConstruct -@@ -1,7 +1,7 @@ - import os - - # Load any environment variables that alter the build. --env = Environment() -+env = Environment(ENV = os.environ) - if 'CCFLAGS' in os.environ: - env.Append(CCFLAGS = os.environ['CCFLAGS']) - if 'CXXFLAGS' in os.environ: @@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("build/" + env["mode"] + "/*.cpp")) |