diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2020-11-27 02:47:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-27 02:47:40 +0100 |
commit | 498ef04c77753c2047a4f55c7a15afa3b71a9287 (patch) | |
tree | 05194cee68df95a2612fd872c84bb39ce00472ec /pkgs/misc/emulators | |
parent | 4a43b8918f5695e5d61da46c96d62e9b4084da6c (diff) | |
parent | 443f42c7f2bdaa5932748d0c7be3755ea621fec2 (diff) |
Merge pull request #101252 from IvarWithoutBones/update-ryujinx
ryujinx: 1.0.5346 -> 1.0.5551
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/ryujinx/default.nix | 6 | ||||
-rw-r--r-- | pkgs/misc/emulators/ryujinx/deps.nix | 14 | ||||
-rw-r--r-- | pkgs/misc/emulators/ryujinx/log.patch | 4 |
3 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index d1fa038982312..0e6784e69eabb 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -13,13 +13,13 @@ let ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.5346"; + version = "1.0.5551"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "2ce59c44bcb2d789f4d6312b26cf41f36915d73c"; - sha256 = "0hk8jdacg8ryhh0mpnfjbzrrpy8gv87f4hp0hybyypglmaxz8grm"; + rev = "2dcc6333f8cbb959293832f52857bdaeab1918bf"; + sha256 = "1hfa498fr9mdxas9s02y25ncb982wa1sqhl06jpnkhqsiicbkgcf"; }; nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index 94093e1e29c67..4f30b159a280f 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -15,6 +15,11 @@ sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) (fetchNuGet { + name = "Crc32.NET"; + version = "1.2.0"; + sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; + }) + (fetchNuGet { name = "DiscordRichPresence"; version = "1.0.150"; sha256 = "0qmbi4sccia3w80q8xfvj3bw62nvz047wq198n2b2aflkf47bq79"; @@ -236,8 +241,8 @@ }) (fetchNuGet { name = "OpenTK.NetStandard"; - version = "1.0.5.12"; - sha256 = "1n8j6k47189l5b6rnhyq391d84v6zkpiiqq41cccb6qizvrcgl69"; + version = "1.0.5.22"; + sha256 = "10bdhc4qbffac862zg03ab5j3iqrr33bydxmnmrxn82brldahm23"; }) (fetchNuGet { name = "PangoSharp"; @@ -490,6 +495,11 @@ sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll"; }) (fetchNuGet { + name = "SharpZipLib"; + version = "1.2.0"; + sha256 = "0ynhx1qkjm723bwjwsrdviw1d2s9azndpa12dagrjshhma3igqm5"; + }) + (fetchNuGet { name = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; diff --git a/pkgs/misc/emulators/ryujinx/log.patch b/pkgs/misc/emulators/ryujinx/log.patch index d25e22fbd3738..7283ef9e7d5d4 100644 --- a/pkgs/misc/emulators/ryujinx/log.patch +++ b/pkgs/misc/emulators/ryujinx/log.patch @@ -1,5 +1,5 @@ diff --git a/Ryujinx.Common/Configuration/LoggerModule.cs b/Ryujinx.Common/Configuration/LoggerModule.cs -index 20c0fb46..ce933730 100644 +index 20c0fb46..534576bc 100644 --- a/Ryujinx.Common/Configuration/LoggerModule.cs +++ b/Ryujinx.Common/Configuration/LoggerModule.cs @@ -75,7 +75,7 @@ namespace Ryujinx.Configuration @@ -7,7 +7,7 @@ index 20c0fb46..ce933730 100644 { Logger.AddTarget(new AsyncLogTargetWrapper( - new FileLogTarget(AppDomain.CurrentDomain.BaseDirectory, "file"), -+ new FileLogTarget(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"), "file"), ++ new FileLogTarget(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"), "file"), 1000, AsyncLogTargetOverflowAction.Block )); |