JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #73719 from willghatch/endless-sky

Browse Source 
endless-sky: 0.9.8 -> 0.9.10
This commit is contained in:
Linus Heckemann 2019-11-19 12:20:43 +01:00 committed by GitHub
commit ff1ead8d42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/endless-sky/default.nix
View File

@ -3,7 +3,7 @@
}: }:
let let
version = "0.9.8"; version = "0.9.10";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -14,7 +14,7 @@ stdenv.mkDerivation {
owner = "endless-sky"; owner = "endless-sky";
repo = "endless-sky"; repo = "endless-sky";
rev = "v${version}"; rev = "v${version}";
sha256 = "0i36lawypikbq8vvzfis1dn7yf6q0d2s1cllshfn7kmjb6pqfi6c"; sha256 = "1wax9qhxakydg6bs92d1jy2fki1n9r0wkps1np02y0pvm1fl189i";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

9
pkgs/games/endless-sky/fixes.patch
View File

@ -2,15 +2,6 @@ diff --git a/SConstruct b/SConstruct
index 48fd080..419b40d 100644 index 48fd080..419b40d 100644
--- a/SConstruct --- a/SConstruct
+++ b/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")) @@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("build/" + env["mode"] + "/*.cpp"))