lol

godot3: 3.5.2 -> 3.6 (#385844)

authored by

Donovan Glover and committed by
GitHub
ff830af8 a3426aa6

+53 -39
+52 -38
pkgs/development/tools/godot/3/default.nix
··· 1 - { lib 2 - , stdenv 3 - , alsa-lib 4 - , alsa-plugins 5 - , autoPatchelfHook 6 - , fetchFromGitHub 7 - , freetype 8 - , installShellFiles 9 - , libGLU 10 - , libpulseaudio 11 - , libX11 12 - , libXcursor 13 - , libXext 14 - , libXfixes 15 - , libXi 16 - , libXinerama 17 - , libXrandr 18 - , libXrender 19 - , makeWrapper 20 - , openssl 21 - , pkg-config 22 - , scons 23 - , udev 24 - , yasm 25 - , zlib 1 + { 2 + lib, 3 + stdenv, 4 + alsa-lib, 5 + alsa-plugins, 6 + autoPatchelfHook, 7 + fetchFromGitHub, 8 + freetype, 9 + installShellFiles, 10 + libGLU, 11 + libpulseaudio, 12 + libX11, 13 + libXcursor, 14 + libXext, 15 + libXfixes, 16 + libXi, 17 + libXinerama, 18 + libXrandr, 19 + libXrender, 20 + makeWrapper, 21 + openssl, 22 + pkg-config, 23 + scons, 24 + udev, 25 + yasm, 26 + zlib, 26 27 }: 27 28 28 29 stdenv.mkDerivation (self: { 29 30 pname = "godot3"; 30 - version = "3.5.2"; 31 + version = "3.6"; 31 32 godotBuildDescription = "X11 tools"; 32 33 33 34 src = fetchFromGitHub { 34 35 owner = "godotengine"; 35 36 repo = "godot"; 36 37 rev = "${self.version}-stable"; 37 - sha256 = "sha256-C+1J5N0ETL1qKust+2xP9uB4x9NwrMqIm8aFAivVYQw="; 38 + sha256 = "sha256-4WQYO1BBDK9+eyblpI8qRgbBG4+qPRVZMjeAFAtot+0="; 38 39 }; 39 40 40 41 nativeBuildInputs = [ ··· 83 84 shouldBuildTools = true; 84 85 godotBuildTarget = "release_debug"; 85 86 86 - shouldUseLinkTimeOptimization = self.godotBuildTarget == "release"; 87 + lto = if self.godotBuildTarget == "release" then "full" else "none"; 87 88 88 89 sconsFlags = [ 89 90 "arch=${stdenv.hostPlatform.linuxArch}" ··· 91 92 "tools=${lib.boolToString self.shouldBuildTools}" 92 93 "target=${self.godotBuildTarget}" 93 94 "bits=${toString stdenv.hostPlatform.parsed.cpu.bits}" 94 - "use_lto=${lib.boolToString self.shouldUseLinkTimeOptimization}" 95 + "lto=${self.lto}" 95 96 ]; 96 97 97 98 shouldWrapBinary = self.shouldBuildTools; ··· 100 101 shouldInstallHeaders = self.shouldBuildTools; 101 102 shouldInstallShortcut = self.shouldBuildTools && self.godotBuildPlatform != "server"; 102 103 103 - outputs = ["out"] ++ lib.optional self.shouldInstallManual "man" ++ lib.optional self.shouldBuildTools "dev"; 104 + outputs = 105 + [ "out" ] 106 + ++ lib.optional self.shouldInstallManual "man" 107 + ++ lib.optional self.shouldBuildTools "dev"; 104 108 105 - builtGodotBinNamePattern = if self.godotBuildPlatform == "server" then "godot_server.*" else "godot.*"; 109 + builtGodotBinNamePattern = 110 + if self.godotBuildPlatform == "server" then "godot_server.*" else "godot.*"; 106 111 107 112 godotBinInstallPath = "bin"; 108 113 installedGodotBinName = self.pname; ··· 150 155 runHook postInstall 151 156 ''; 152 157 153 - runtimeDependencies = lib.optionals self.shouldPatchBinary (map lib.getLib [ 154 - alsa-lib 155 - libpulseaudio 156 - udev 157 - ]); 158 + runtimeDependencies = lib.optionals self.shouldPatchBinary ( 159 + map lib.getLib [ 160 + alsa-lib 161 + libpulseaudio 162 + udev 163 + ] 164 + ); 158 165 159 166 meta = with lib; { 160 167 homepage = "https://godotengine.org"; 161 168 description = "Free and Open Source 2D and 3D game engine (" + self.godotBuildDescription + ")"; 162 169 license = licenses.mit; 163 - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; 164 - maintainers = with maintainers; [ rotaerk twey ]; 170 + platforms = [ 171 + "i686-linux" 172 + "x86_64-linux" 173 + "aarch64-linux" 174 + ]; 175 + maintainers = with maintainers; [ 176 + rotaerk 177 + twey 178 + ]; 165 179 }; 166 180 })
+1 -1
pkgs/development/tools/godot/3/mono/patches/gen_cs_glue_version.py/hardcodeGlueVersion_3.5.2.patch pkgs/development/tools/godot/3/mono/patches/gen_cs_glue_version.py/hardcodeGlueVersion_3.6.patch
··· 16 16 - latest_mtime = mtime if mtime > latest_mtime else latest_mtime 17 17 - 18 18 - glue_version = int(latest_mtime) # The latest modified time will do for now 19 - + glue_version = 1678112021 19 + + glue_version = 1725828088 20 20 21 21 with open(version_header_dst, "w") as version_header: 22 22 version_header.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")