Merge pull request #111045 from IvarWithoutBones/fix-ryujinx

ryujinx: 1.0.6416 -> 1.0.6448

authored by

Sandro and committed by
GitHub
b52146a0 f05284c4

+43 -5
+10 -5
pkgs/misc/emulators/ryujinx/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs 2 2 , dotnet-sdk_5, dotnetPackages, dotnetCorePackages 3 - , SDL2, libX11, openal 3 + , SDL2, libX11, ffmpeg, openal, libsoundio 4 4 , gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook 5 5 }: 6 6 ··· 9 9 SDL2 10 10 gtk3 11 11 libX11 12 + ffmpeg 12 13 openal 14 + libsoundio 13 15 ]; 14 16 in stdenv.mkDerivation rec { 15 17 pname = "ryujinx"; 16 - version = "1.0.6416"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx 18 + version = "1.0.6448"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx 17 19 18 20 src = fetchFromGitHub { 19 21 owner = "Ryujinx"; 20 22 repo = "Ryujinx"; 21 - rev = "ad491b5570ec428d0d87d56426b03125e2ca5220"; 22 - sha256 = "0gjrvdh6n26r9kkljiw9xvmvb47vmpwsjxi4iv41ir3nsdigdvsn"; 23 + rev = "9eb0ab05c6e820e113b3c61cbacd9b085b2819c4"; 24 + sha256 = "168nm7p6lqswmsya6gf3296ligyjabqmbrdzginkcviii643yslz"; 23 25 }; 24 26 25 27 nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; ··· 32 34 }; 33 35 }); 34 36 35 - patches = [ ./log.patch ]; # Without this, Ryujinx tries to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. 37 + patches = [ 38 + ./log.patch # Without this, Ryujinx attempts to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. 39 + ./disable-updater.patch # This disables the auto-updater, which does not work as it attempts to modify the nix store. 40 + ]; 36 41 37 42 configurePhase = '' 38 43 runHook preConfigure
+33
pkgs/misc/emulators/ryujinx/disable-updater.patch
··· 1 + diff --git a/Ryujinx/Program.cs b/Ryujinx/Program.cs 2 + index 29043bb8..d3973c7c 100644 3 + --- a/Ryujinx/Program.cs 4 + +++ b/Ryujinx/Program.cs 5 + @@ -54,9 +54,6 @@ namespace Ryujinx 6 + } 7 + } 8 + 9 + - // Delete backup files after updating. 10 + - Task.Run(Updater.CleanupUpdate); 11 + - 12 + Toolkit.Init(new ToolkitOptions 13 + { 14 + Backend = PlatformBackend.PreferNative 15 + @@ -146,11 +143,6 @@ namespace Ryujinx 16 + mainWindow.LoadApplication(launchPathArg); 17 + } 18 + 19 + - if (ConfigurationState.Instance.CheckUpdatesOnStart.Value && Updater.CanUpdate(false)) 20 + - { 21 + - _ = Updater.BeginParse(mainWindow, false); 22 + - } 23 + - 24 + Application.Run(); 25 + } 26 + 27 + @@ -200,4 +192,4 @@ namespace Ryujinx 28 + Logger.Shutdown(); 29 + } 30 + } 31 + -} 32 + \ No newline at end of file 33 + +}