pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #213084 from shiryel/godot4-beta16

godot_4: 4.0-beta14 -> 4.0-beta16

authored by Weijia Wang and committed by GitHub 180ef5b9 19fa7c32

+14 -30
unified split
+14 -18
pkgs/development/tools/godot/4/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 - , installShellFiles 5 - , autoPatchelfHook 6 4 , pkg-config 5 + , autoPatchelfHook 6 + , installShellFiles 7 7 , scons 8 8 , vulkan-loader 9 + , libGL 9 10 , libX11 10 11 , libXcursor 11 12 , libXinerama ··· 14 15 , libXrender 15 16 , libXi 16 17 , libXfixes 17 - , freetype 18 + , libxkbcommon 18 19 , alsa-lib 19 20 , libpulseaudio 20 21 , dbus ··· 24 25 , withPlatform ? "linuxbsd" 25 26 , withTarget ? "editor" 26 27 , withPrecision ? "single" 27 - , withPulseaudio ? false 28 + , withPulseaudio ? true 28 29 , withDbus ? true 29 - , withSpeechd ? false 30 + , withSpeechd ? true 30 31 , withFontconfig ? true 31 32 , withUdev ? true 32 33 , withTouch ? true ··· 42 43 precision = withPrecision; # Floating-point precision level 43 44 44 45 # Options from 'godot/platform/linuxbsd/detect.py' 45 - pulseaudio = withPulseaudio; 46 + pulseaudio = withPulseaudio; # Use PulseAudio 46 47 dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings 47 48 speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support 48 49 fontconfig = withFontconfig; # Use fontconfig for system fonts support ··· 52 53 in 53 54 stdenv.mkDerivation rec { 54 55 pname = "godot"; 55 - version = "4.0-beta14"; 56 + version = "4.0-beta16"; 56 57 57 58 src = fetchFromGitHub { 58 59 owner = "godotengine"; 59 60 repo = "godot"; 60 - rev = "28a24639c3c6a95b5b9828f5f02bf0dc2f5ce54b"; 61 - sha256 = "sha256-qAotCc2YUg8FMK+JFHi5B4OL/cAtvWO/pYRRz8RcNUY="; 61 + rev = "518b9e5801a19229805fe837d7d0cf92920ad413"; 62 + sha256 = "sha256-45x4moHOn/PWRazuJ/CBb3WYaPZqv4Sn8ZIugUSaVjY="; 62 63 }; 63 64 64 65 nativeBuildInputs = [ ··· 69 70 70 71 buildInputs = [ 71 72 scons 72 - ] 73 - ++ runtimeDependencies; 73 + ]; 74 74 75 75 runtimeDependencies = [ 76 + vulkan-loader 77 + libGL 76 78 libX11 77 79 libXcursor 78 80 libXinerama ··· 81 83 libXrender 82 84 libXi 83 85 libXfixes 86 + libxkbcommon 84 87 alsa-lib 85 - vulkan-loader 86 88 ] 87 89 ++ lib.optional withPulseaudio libpulseaudio 88 90 ++ lib.optional withDbus dbus ··· 91 93 ++ lib.optional withFontconfig fontconfig 92 94 ++ lib.optional withFontconfig fontconfig.lib 93 95 ++ lib.optional withUdev udev; 94 - 95 - patches = [ 96 - # Godot expects to find xfixes inside xi, but nix's pkg-config only 97 - # gives the libs for the requested package (ignoring the propagated-build-inputs) 98 - ./xfixes.patch 99 - ]; 100 96 101 97 enableParallelBuilding = true; 102 98
-12
pkgs/development/tools/godot/4/xfixes.patch
··· 1 - diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py 2 - index 844b15e9fb..0c8bee1757 100644 3 - --- a/platform/linuxbsd/detect.py 4 - +++ b/platform/linuxbsd/detect.py 5 - @@ -192,6 +192,7 @@ def configure(env: "Environment"): 6 - env.ParseConfig("pkg-config xrandr --cflags") 7 - env.ParseConfig("pkg-config xrender --cflags") 8 - env.ParseConfig("pkg-config xi --cflags") 9 - + env.ParseConfig("pkg-config xfixes --cflags") 10 - 11 - if env["touch"]: 12 - env.Append(CPPDEFINES=["TOUCH_ENABLED"])