diff options
Diffstat (limited to 'nixpkgs/pkgs/misc/emulators/ryujinx/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/misc/emulators/ryujinx/default.nix | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix b/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix index 79d71301163a..60e595bc51ba 100644 --- a/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs -, dotnet-sdk_3, dotnetPackages, dotnetCorePackages -, SDL2, libX11, openal -, gtk3, gobject-introspection, wrapGAppsHook +, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert +, SDL2, libX11, ffmpeg, openal, libsoundio +, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook }: let @@ -9,20 +9,22 @@ let SDL2 gtk3 libX11 + ffmpeg openal + libsoundio ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.5551"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.6498"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "2dcc6333f8cbb959293832f52857bdaeab1918bf"; - sha256 = "1hfa498fr9mdxas9s02y25ncb982wa1sqhl06jpnkhqsiicbkgcf"; + rev = "67033ed8e05eb70860ac6af2b83deab0256c11eb"; + sha256 = "1lg0cybbrf0x3jl10jwdwcg1zyhxsqfdnwnsvdm1lah75xg15ymw"; }; - nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { fetchNuGet = { name, version, sha256 }: fetchurl { @@ -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 @@ -73,12 +78,12 @@ in stdenv.mkDerivation rec { shopt -s extglob makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \ - --set DOTNET_ROOT "${dotnetCorePackages.netcore_3_1}" \ + --set DOTNET_ROOT "${dotnetCorePackages.net_5_0}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ ''${gappsWrapperArgs[@]} for i in 16 32 48 64 96 128 256 512 1024; do - install -D ${src}/Ryujinx/Ui/assets/Icon.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png + install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png done cp -r ${makeDesktopItem { desktopName = "Ryujinx"; |