git.iko.soy/typeable/nixpkgs
on master help sign in
ryujinx: 1.0.6893 -> 1.0.6954
commit7b75e40000301bac5f69206e1c474e6f3164e789 authorIvarWithoutBones <ivar.scholten@protonmail.com> dateWed 7 Jul 2021, 03:55 (5 years ago) parent176b8cc
2 files changed+20−10
pkgs/misc/emulators/ryujinx/default.nix+10−5 pkgs/misc/emulators/ryujinx/deps.nix+10−5
pkgs/misc/emulators/ryujinx/default.nix+10−5
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
22, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert
33, libX11, libgdiplus, ffmpeg
4−, SDL2_mixer, openal, libsoundio, sndio
4+, SDL2_mixer, openal, libsoundio, sndio, pulseaudio
55, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook
66}:
77
@@ -15,16 +15,17 @@ let
1515 openal
1616 libsoundio
1717 sndio
18+ pulseaudio
1819 ];
1920in stdenv.mkDerivation rec {
2021 pname = "ryujinx";
21− version = "1.0.6893"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
22+ version = "1.0.6954"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
2223
2324 src = fetchFromGitHub {
2425 owner = "Ryujinx";
2526 repo = "Ryujinx";
26− rev = "fb65f392d1c4b0e01f22b6ddebcc8317ba9769c3";
27− sha256 = "0ncrcbwyirz21j81vc6yvcjc2fn8nc5ilrfczclq6f8cpy09c3y8";
27+ rev = "31cbd09a75a9d5f4814c3907a060e0961eb2bb15";
28+ sha256 = "00qql0wmlzs722s0igip3v0yjlqhc31jcr7nghwibcqrmx031azk";
2829 };
2930
3031 nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];
@@ -79,9 +80,13 @@ in stdenv.mkDerivation rec {
7980 --output $out/lib/ryujinx
8081 shopt -s extglob
8182
83+ # TODO: fix this hack https://github.com/Ryujinx/Ryujinx/issues/2349
84+ mkdir -p $out/lib/sndio-6
85+ ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6
86+
8287 makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \
8388 --set DOTNET_ROOT "${dotnetCorePackages.net_5_0}" \
84− --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \
89+ --suffix LD_LIBRARY_PATH : "${builtins.concatStringsSep ":" [ (lib.makeLibraryPath runtimeDeps) "$out/lib/sndio-6" ]}" \
8590 ''${gappsWrapperArgs[@]}
8691
8792 for i in 16 32 48 64 96 128 256 512 1024; do
pkgs/misc/emulators/ryujinx/deps.nix+10−5
@@ -9,6 +9,11 @@
99 version = "3.22.25.128";
1010 sha256 = "1rjdxd4fq5z3n51qx8vrcaf4i277ccc62jxk88xzbsxapdmjjdf9";
1111 })
12+ (fetchNuGet {
13+ name = "CommandLineParser";
14+ version = "2.8.0";
15+ sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb";
16+ })
1217 (fetchNuGet {
1318 name = "Concentus";
1419 version = "1.1.7";
@@ -259,11 +264,6 @@
259264 version = "3.22.25.128";
260265 sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp";
261266 })
262− (fetchNuGet {
263− name = "ppy.SDL2-CS";
264− version = "1.0.225-alpha";
265− sha256 = "1x8hvk9kikwi7wrvwxdxk3pkbs491iss2mvqgiw844zld5izihqc";
266− })
267267 (fetchNuGet {
268268 name = "runtime.any.System.Collections";
269269 version = "4.3.0";
@@ -514,6 +514,11 @@
514514 version = "4.4.0-build7";
515515 sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m";
516516 })
517+ (fetchNuGet {
518+ name = "Ryujinx.SDL2-CS";
519+ version = "2.0.15-build11";
520+ sha256 = "0s4h69l2b508l5wxp4v4ip8k83k78p3963xxv8bfamin9517przi";
521+ })
517522 (fetchNuGet {
518523 name = "SharpZipLib";
519524 version = "1.3.0";