From bedcb97d246bf99939c150240a06de2c40426b11 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Mon, 25 Oct 2021 00:15:04 +0200 Subject: [PATCH] ryujinx: 1.0.7065 -> 1.0.7086 --- pkgs/misc/emulators/ryujinx/default.nix | 44 ++++++++++++++++--------- pkgs/misc/emulators/ryujinx/deps.nix | 3 +- pkgs/misc/emulators/ryujinx/updater.sh | 17 ++-------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index e584331ea669..18fe2a2c1ead 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem +{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem, copyDesktopItems , libX11, libgdiplus, ffmpeg , SDL2_mixer, openal, libsoundio, sndio, pulseaudio , gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook @@ -6,20 +6,31 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.0.7065"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.7086"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "c54a14d0b8d445d9d0074861dca816cc801e4008"; - sha256 = "13j91413x1bvg27vcx9sgc7gv00q84d8f5pllih5g5plzld4r541"; + rev = "85d8d1d7cab5615e6911b7b570c8dd0b94a521ab"; + sha256 = "11j54c7qrb7vcay8bjpv2jykdnwsjhf5cmqds43wvbicigbbds54"; }; projectFile = "Ryujinx.sln"; - executables = [ "Ryujinx" ]; nugetDeps = ./deps.nix; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection gdk-pixbuf ]; + dotnetFlags = [ "/p:ExtraDefineConstants=DISABLE_UPDATER" ]; + + # TODO: Add the headless frontend. Currently errors on the following: + # System.Exception: SDL2 initlaization failed with error "No available video device" + executables = [ "Ryujinx" ]; + + nativeBuildInputs = [ + copyDesktopItems + wrapGAppsHook + gobject-introspection + gdk-pixbuf + ]; + runtimeDeps = [ gtk3 libX11 @@ -48,22 +59,23 @@ buildDotnetModule rec { for i in 16 32 48 64 96 128 256 512 1024; do 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"; - name = "ryujinx"; - exec = "Ryujinx"; - icon = "ryujinx"; - comment = meta.description; - type = "Application"; - categories = "Game;"; - }}/share/applications $out/share ''; + desktopItems = [(makeDesktopItem { + desktopName = "Ryujinx"; + name = "ryujinx"; + exec = "Ryujinx"; + icon = "ryujinx"; + comment = meta.description; + type = "Application"; + categories = "Game;"; + })]; + meta = with lib; { description = "Experimental Nintendo Switch Emulator written in C#"; homepage = "https://ryujinx.org/"; license = licenses.mit; + changelog = "https://github.com/Ryujinx/Ryujinx/wiki/Changelog"; maintainers = [ maintainers.ivar ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index 6ebf7acd048e..c89d203863c3 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -5,7 +5,7 @@ (fetchNuGet { name = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) (fetchNuGet { name = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; }) (fetchNuGet { name = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) - (fetchNuGet { name = "FFmpeg.AutoGen"; version = "4.4.0"; sha256 = "02n4az1jv30078019png9gbspygz051inxsn6w4iar20dqp55g2w"; }) + (fetchNuGet { name = "FFmpeg.AutoGen"; version = "4.4.1"; sha256 = "01j989g68arm2d8abq44hp0f22pp6azf2xi7wi7hv7m4sl0l9cwp"; }) (fetchNuGet { name = "GdkSharp"; version = "3.22.25.128"; sha256 = "0bmn0ddaw8797pnhpyl03h2zl8i5ha67yv38gly4ydy50az2xhj7"; }) (fetchNuGet { name = "GioSharp"; version = "3.22.25.128"; sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; }) (fetchNuGet { name = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) @@ -102,6 +102,7 @@ (fetchNuGet { name = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) (fetchNuGet { name = "Ryujinx.Audio.OpenAL.Dependencies"; version = "1.21.0.1"; sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; }) (fetchNuGet { name = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.4.0-build7"; sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m"; }) + (fetchNuGet { name = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.4.0-build9"; sha256 = "121zmh0byi22qsc9b25wv58kwcq6pmk7zf4f2rfafmdjvwx8bkxc"; }) (fetchNuGet { name = "Ryujinx.SDL2-CS"; version = "2.0.17-build18"; sha256 = "0j0vs6075c4fniydqxhpp18pg3x679mq463x4gxqgkri3vhpj4vl"; }) (fetchNuGet { name = "SharpZipLib"; version = "1.3.0"; sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4"; }) (fetchNuGet { name = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) diff --git a/pkgs/misc/emulators/ryujinx/updater.sh b/pkgs/misc/emulators/ryujinx/updater.sh index db8fd9254faf..16bfa3083aa1 100755 --- a/pkgs/misc/emulators/ryujinx/updater.sh +++ b/pkgs/misc/emulators/ryujinx/updater.sh @@ -31,21 +31,8 @@ cp -rT "$store_src" "$src" chmod -R +w "$src" pushd "$src" -# Setup empty nuget package folder to force reinstall. -mkdir ./nuget_tmp.packages -cat >./nuget_tmp.config < - - - - - - - - -EOF - -dotnet restore Ryujinx.sln --configfile ./nuget_tmp.config +mkdir nuget_tmp.packages +dotnet restore Ryujinx.sln --packages nuget_tmp.packages nuget-to-nix ./nuget_tmp.packages > "$deps_file"