godot: 3.2.1 -> 3.2.2
This commit is contained in:
parent
af0d1f955f
commit
20479cd349
|
@ -10,13 +10,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "godot";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "godotengine";
|
||||
repo = "godot";
|
||||
rev = "${version}-stable";
|
||||
sha256 = "1kndls0rklha7kz9l4i2ivjxab4jpk3b2j7dcgcg2qc3s81yd0r6";
|
||||
sha256 = "1libz83mbyrkbbsmmi8z2rydv3ls0w9r4vb5v6diqqwn7ka8z804";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
@ -1,16 +1,18 @@
|
|||
+++ build/SConstruct
|
||||
@@ -63,10 +63,10 @@ elif platform_arg == 'javascript':
|
||||
custom_tools = ['cc', 'c++', 'ar', 'link', 'textfile', 'zip']
|
||||
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index b3d033dc90..04b8dcc832 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -62,10 +62,9 @@ elif platform_arg == "javascript":
|
||||
custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"]
|
||||
|
||||
env_base = Environment(tools=custom_tools)
|
||||
-if 'TERM' in os.environ:
|
||||
- env_base['ENV']['TERM'] = os.environ['TERM']
|
||||
-env_base.AppendENVPath('PATH', os.getenv('PATH'))
|
||||
-env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
|
||||
-if "TERM" in os.environ:
|
||||
- env_base["ENV"]["TERM"] = os.environ["TERM"]
|
||||
-env_base.AppendENVPath("PATH", os.getenv("PATH"))
|
||||
-env_base.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
|
||||
+for k in ("TERM", "PATH", "PKG_CONFIG_PATH"):
|
||||
+ if (k in os.environ):
|
||||
+ env_base["ENV"][k] = os.environ[k]
|
||||
+
|
||||
env_base.disabled_modules = []
|
||||
env_base.use_ptrcall = False
|
||||
env_base.module_version_string = ""
|
||||
|
|
|
@ -1,22 +1,25 @@
|
|||
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
|
||||
index 5674e78350..7051d8e73c 100644
|
||||
--- a/platform/x11/detect.py
|
||||
+++ b/platform/x11/detect.py
|
||||
@@ -175,6 +175,11 @@ def configure(env):
|
||||
env.ParseConfig('pkg-config xrender --cflags --libs')
|
||||
env.ParseConfig('pkg-config xi --cflags --libs')
|
||||
@@ -201,6 +201,11 @@ def configure(env):
|
||||
env.ParseConfig("pkg-config xrender --cflags --libs")
|
||||
env.ParseConfig("pkg-config xi --cflags --libs")
|
||||
|
||||
+ env.ParseConfig('pkg-config xext --cflags --libs')
|
||||
+ env.ParseConfig('pkg-config xfixes --cflags --libs')
|
||||
+ env.ParseConfig('pkg-config glu --cflags --libs')
|
||||
+ env.ParseConfig('pkg-config zlib --cflags --libs')
|
||||
+ env.ParseConfig("pkg-config xext --cflags --libs")
|
||||
+ env.ParseConfig("pkg-config xfixes --cflags --libs")
|
||||
+ env.ParseConfig("pkg-config glu --cflags --libs")
|
||||
+ env.ParseConfig("pkg-config zlib --cflags --libs")
|
||||
+
|
||||
if (env['touch']):
|
||||
env.Append(CPPFLAGS=['-DTOUCH_ENABLED'])
|
||||
if env["touch"]:
|
||||
env.Append(CPPDEFINES=["TOUCH_ENABLED"])
|
||||
|
||||
@@ -264,7 +269,7 @@ def configure(env):
|
||||
@@ -299,7 +304,7 @@ def configure(env):
|
||||
print("Enabling ALSA")
|
||||
env.Append(CPPFLAGS=["-DALSA_ENABLED", "-DALSAMIDI_ENABLED"])
|
||||
# Don't parse --cflags, we don't need to add /usr/include/alsa to include path
|
||||
- env.ParseConfig('pkg-config alsa --libs')
|
||||
+ env.ParseConfig('pkg-config alsa --cflags --libs')
|
||||
env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"])
|
||||
# Don't parse --cflags, we don't need to add /usr/include/alsa to include path
|
||||
- env.ParseConfig("pkg-config alsa --libs")
|
||||
+ env.ParseConfig("pkg-config alsa --cflags --libs")
|
||||
else:
|
||||
print("ALSA libraries not found, disabling driver")
|
||||
|
||||
|
|
Loading…
Reference in a new issue