Merge pull request #111045 from IvarWithoutBones/fix-ryujinx

ryujinx: 1.0.6416 -> 1.0.6448
This commit is contained in:
Sandro 2021-01-29 02:17:30 +01:00 committed by GitHub
commit b52146a0df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 5 deletions

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
, dotnet-sdk_5, dotnetPackages, dotnetCorePackages
, SDL2, libX11, openal
, SDL2, libX11, ffmpeg, openal, libsoundio
, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook
}:
@ -9,17 +9,19 @@ let
SDL2
gtk3
libX11
ffmpeg
openal
libsoundio
];
in stdenv.mkDerivation rec {
pname = "ryujinx";
version = "1.0.6416"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
version = "1.0.6448"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "ad491b5570ec428d0d87d56426b03125e2ca5220";
sha256 = "0gjrvdh6n26r9kkljiw9xvmvb47vmpwsjxi4iv41ir3nsdigdvsn";
rev = "9eb0ab05c6e820e113b3c61cbacd9b085b2819c4";
sha256 = "168nm7p6lqswmsya6gf3296ligyjabqmbrdzginkcviii643yslz";
};
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];
@ -32,7 +34,10 @@ in stdenv.mkDerivation rec {
};
});
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.
patches = [
./log.patch # Without this, Ryujinx attempts to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux.
./disable-updater.patch # This disables the auto-updater, which does not work as it attempts to modify the nix store.
];
configurePhase = ''
runHook preConfigure

View file

@ -0,0 +1,33 @@
diff --git a/Ryujinx/Program.cs b/Ryujinx/Program.cs
index 29043bb8..d3973c7c 100644
--- a/Ryujinx/Program.cs
+++ b/Ryujinx/Program.cs
@@ -54,9 +54,6 @@ namespace Ryujinx
}
}
- // Delete backup files after updating.
- Task.Run(Updater.CleanupUpdate);
-
Toolkit.Init(new ToolkitOptions
{
Backend = PlatformBackend.PreferNative
@@ -146,11 +143,6 @@ namespace Ryujinx
mainWindow.LoadApplication(launchPathArg);
}
- if (ConfigurationState.Instance.CheckUpdatesOnStart.Value && Updater.CanUpdate(false))
- {
- _ = Updater.BeginParse(mainWindow, false);
- }
-
Application.Run();
}
@@ -200,4 +192,4 @@ namespace Ryujinx
Logger.Shutdown();
}
}
-}
\ No newline at end of file
+}