Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4a43b8918f56
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 498ef04c7775
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 21, 2020

  1. ryujinx: 1.0.5346 -> 1.0.5551

    @IvarWithoutBones
    IvarWithoutBones committed Oct 21, 2020
    Copy the full SHA
    443f42c View commit details

Commits on Nov 27, 2020

  1. Merge pull request #101252 from IvarWithoutBones/update-ryujinx 

    ryujinx: 1.0.5346 -> 1.0.5551
    @SuperSandro2000
    SuperSandro2000 authored Nov 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    498ef04 View commit details
Showing with 17 additions and 7 deletions.
  1. +3 −3 pkgs/misc/emulators/ryujinx/default.nix
  2. +12 −2 pkgs/misc/emulators/ryujinx/deps.nix
  3. +2 −2 pkgs/misc/emulators/ryujinx/log.patch
6 changes: 3 additions & 3 deletions pkgs/misc/emulators/ryujinx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
14 changes: 12 additions & 2 deletions pkgs/misc/emulators/ryujinx/deps.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkgs/misc/emulators/ryujinx/log.patch
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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
if (e.NewValue)
{
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
));