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

Merge pull request #58029 from tilpner/godot-update

Browse Source 
godot: 3.0.6 -> 3.1
This commit is contained in:
Graham Christensen 2019-04-05 07:36:06 -04:00 committed by GitHub
commit d656b73371
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/godot/default.nix
View File

@ -10,13 +10,13 @@ let
};
in stdenv.mkDerivation rec {
name = "godot-${version}";
version = "3.0.6";
version = "3.1";
src = fetchFromGitHub {
owner = "godotengine";
repo = "godot";
rev = "${version}-stable";
sha256 = "0g64h0x8dlv6aa9ggfcidk2mknkfl5li7z1phcav8aqp9srj8avf";
sha256 = "1z37znqzbn0x8s04pb9dxzni9jzl8m59nfrr14vypww42f9l5i7i";
};
nativeBuildInputs = [ pkgconfig ];
@ -51,10 +51,10 @@ in stdenv.mkDerivation rec {
cp misc/dist/linux/godot.6 "$man/share/man/man6/"
mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps}
cp misc/dist/linux/godot.desktop "$out/share/applications/"
cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/"
cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg"
cp icon.png "$out/share/icons/godot.png"
substituteInPlace "$out/share/applications/godot.desktop" \
substituteInPlace "$out/share/applications/org.godotengine.Godot.desktop" \
--replace "Exec=godot" "Exec=$out/bin/godot"
'';

9
pkgs/development/tools/godot/dont_clobber_environment.patch
View File

@ -1,7 +1,7 @@
+++ build/SConstruct
@@ -69,10 +69,10 @@
custom_tools = ['mingw']
@@ -63,10 +63,10 @@ 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']
@ -11,6 +11,7 @@
+ if (k in os.environ):
+ env_base["ENV"][k] = os.environ[k]
+
env_base.global_defaults = global_defaults
env_base.android_maven_repos = []
env_base.android_flat_dirs = []
env_base.android_dependencies = []

23
pkgs/development/tools/godot/pkg_config_additions.patch
View File

@ -1,13 +1,22 @@
+++ b/platform/x11/detect.py
@@ -142,6 +142,11 @@
env.ParseConfig('pkg-config xcursor --cflags --libs')
env.ParseConfig('pkg-config xinerama --cflags --libs')
env.ParseConfig('pkg-config xrandr --cflags --libs')
+ env.ParseConfig('pkg-config xrender --cflags --libs')
@@ -175,6 +175,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')
+
if (env['touch']):
x11_error = os.system("pkg-config xi --modversion > /dev/null ")
env.Append(CPPFLAGS=['-DTOUCH_ENABLED'])
@@ -264,7 +269,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')
else:
print("ALSA libraries not found, disabling driver")