tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

godot: 3.0.6 -> 3.1

tilpner 94717b7e 0cbe2fa1

+25 -15
+4 -4
pkgs/development/tools/godot/default.nix
··· 10 10 }; 11 11 in stdenv.mkDerivation rec { 12 12 name = "godot-${version}"; 13 - version = "3.0.6"; 13 + version = "3.1"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "godotengine"; 17 17 repo = "godot"; 18 18 rev = "${version}-stable"; 19 - sha256 = "0g64h0x8dlv6aa9ggfcidk2mknkfl5li7z1phcav8aqp9srj8avf"; 19 + sha256 = "1z37znqzbn0x8s04pb9dxzni9jzl8m59nfrr14vypww42f9l5i7i"; 20 20 }; 21 21 22 22 nativeBuildInputs = [ pkgconfig ]; ··· 51 51 cp misc/dist/linux/godot.6 "$man/share/man/man6/" 52 52 53 53 mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps} 54 - cp misc/dist/linux/godot.desktop "$out/share/applications/" 54 + cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/" 55 55 cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg" 56 56 cp icon.png "$out/share/icons/godot.png" 57 - substituteInPlace "$out/share/applications/godot.desktop" \ 57 + substituteInPlace "$out/share/applications/org.godotengine.Godot.desktop" \ 58 58 --replace "Exec=godot" "Exec=$out/bin/godot" 59 59 ''; 60 60
+5 -4
pkgs/development/tools/godot/dont_clobber_environment.patch
··· 1 1 +++ build/SConstruct 2 - @@ -69,10 +69,10 @@ 3 - custom_tools = ['mingw'] 4 - 2 + @@ -63,10 +63,10 @@ elif platform_arg == 'javascript': 3 + custom_tools = ['cc', 'c++', 'ar', 'link', 'textfile', 'zip'] 4 + 5 5 env_base = Environment(tools=custom_tools) 6 6 -if 'TERM' in os.environ: 7 7 - env_base['ENV']['TERM'] = os.environ['TERM'] ··· 11 11 + if (k in os.environ): 12 12 + env_base["ENV"][k] = os.environ[k] 13 13 + 14 - env_base.global_defaults = global_defaults 15 14 env_base.android_maven_repos = [] 16 15 env_base.android_flat_dirs = [] 16 + env_base.android_dependencies = [] 17 +
+16 -7
pkgs/development/tools/godot/pkg_config_additions.patch
··· 1 1 +++ b/platform/x11/detect.py 2 - @@ -142,6 +142,11 @@ 3 - env.ParseConfig('pkg-config xcursor --cflags --libs') 4 - env.ParseConfig('pkg-config xinerama --cflags --libs') 5 - env.ParseConfig('pkg-config xrandr --cflags --libs') 6 - + env.ParseConfig('pkg-config xrender --cflags --libs') 2 + @@ -175,6 +175,11 @@ def configure(env): 3 + env.ParseConfig('pkg-config xrender --cflags --libs') 4 + env.ParseConfig('pkg-config xi --cflags --libs') 5 + 7 6 + env.ParseConfig('pkg-config xext --cflags --libs') 8 7 + env.ParseConfig('pkg-config xfixes --cflags --libs') 9 8 + env.ParseConfig('pkg-config glu --cflags --libs') 10 9 + env.ParseConfig('pkg-config zlib --cflags --libs') 11 - 10 + + 12 11 if (env['touch']): 13 - x11_error = os.system("pkg-config xi --modversion > /dev/null ") 12 + env.Append(CPPFLAGS=['-DTOUCH_ENABLED']) 13 + 14 + @@ -264,7 +269,7 @@ def configure(env): 15 + print("Enabling ALSA") 16 + env.Append(CPPFLAGS=["-DALSA_ENABLED", "-DALSAMIDI_ENABLED"]) 17 + # Don't parse --cflags, we don't need to add /usr/include/alsa to include path 18 + - env.ParseConfig('pkg-config alsa --libs') 19 + + env.ParseConfig('pkg-config alsa --cflags --libs') 20 + else: 21 + print("ALSA libraries not found, disabling driver") 22 +