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: a7dda29d8aba
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a948db76f38f
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 25, 2021

  1. ryujinx: 1.0.5551 -> 1.0.6416

    @IvarWithoutBones
    IvarWithoutBones committed Jan 25, 2021
    Copy the full SHA
    1f274be View commit details

  2. Merge pull request #110812 from IvarWithoutBones/ryujinx-net5 

    ryujinx: 1.0.5551 -> 1.0.6416
    @SuperSandro2000
    SuperSandro2000 authored Jan 25, 2021
    Copy the full SHA
    a948db7 View commit details
Showing with 82 additions and 62 deletions.
  1. +8 −8 pkgs/misc/emulators/ryujinx/default.nix
  2. +73 −53 pkgs/misc/emulators/ryujinx/deps.nix
  3. +1 −1 pkgs/misc/emulators/ryujinx/fetch-deps.sh
16 changes: 8 additions & 8 deletions pkgs/misc/emulators/ryujinx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
, dotnet-sdk_3, dotnetPackages, dotnetCorePackages
, dotnet-sdk_5, dotnetPackages, dotnetCorePackages
, SDL2, libX11, openal
, gtk3, gobject-introspection, wrapGAppsHook
, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook
}:

let
@@ -13,16 +13,16 @@ let
];
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.6416"; # 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 = "ad491b5570ec428d0d87d56426b03125e2ca5220";
sha256 = "0gjrvdh6n26r9kkljiw9xvmvb47vmpwsjxi4iv41ir3nsdigdvsn";
};

nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ];
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];

nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix {
fetchNuGet = { name, version, sha256 }: fetchurl {
@@ -73,12 +73,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";
126 changes: 73 additions & 53 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.

2 changes: 1 addition & 1 deletion pkgs/misc/emulators/ryujinx/fetch-deps.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_3
#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5
set -eo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"