Merge pull request #110810 from IvarWithoutBones/yuzu-{mainline,ea}

This commit is contained in:
Sandro 2021-02-01 19:47:12 +01:00 committed by GitHub
commit 1c51dd2964
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 106 additions and 47 deletions

View File

@ -0,0 +1,72 @@
{ pname, version, src, branchName
, stdenv, lib, fetchFromGitHub, wrapQtAppsHook
, cmake, pkg-config
, libpulseaudio, libjack2, alsaLib, sndio, ecasound
, vulkan-loader, vulkan-headers
, qtbase, qtwebengine, qttools
, nlohmann_json, rapidjson
, zlib, zstd, libzip, lz4
, glslang
, boost173
, catch2
, fmt
, SDL2
, udev
, libusb1
, ffmpeg
}:
stdenv.mkDerivation rec {
inherit pname version src;
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [
libpulseaudio libjack2 alsaLib sndio ecasound
vulkan-loader vulkan-headers
qtbase qtwebengine qttools
nlohmann_json rapidjson
zlib zstd libzip lz4
glslang
boost173
catch2
fmt
SDL2
udev
libusb1
ffmpeg
];
cmakeFlags = [
"-DENABLE_QT_TRANSLATION=ON"
"-DYUZU_USE_QT_WEB_ENGINE=ON"
"-DUSE_DISCORD_PRESENCE=ON"
];
# Trick the configure system. This prevents a check for submodule directories.
preConfigure = ''
rm -f .gitmodules
'';
# Fix vulkan detection
postFixup = ''
wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
'';
meta = with lib; {
homepage = "https://yuzu-emu.org";
description = "The ${branchName} branch of an experimental Nintendo Switch emulator written in C++";
longDescription = ''
An experimental Nintendo Switch emulator written in C++.
Using the mainline branch is recommanded for general usage.
Using the early-access branch is recommanded if you would like to try out experimental features, with a cost of stability.
'';
license = with licenses; [
gpl2Plus
# Icons
cc-by-nd-30 cc0
];
maintainers = with maintainers; [ ivar joshuafern ];
platforms = platforms.linux;
};
}

View File

@ -1,47 +1,28 @@
{ lib, stdenv, fetchFromGitHub
, cmake, pkg-config, wrapQtAppsHook
, boost173, catch2, fmt, lz4, nlohmann_json, rapidjson, zlib, zstd, SDL2
, udev, libusb1, libzip, qtbase, qtwebengine, qttools, ffmpeg
, libpulseaudio, libjack2, alsaLib, sndio, ecasound
, useVulkan ? true, vulkan-loader, vulkan-headers
}:
stdenv.mkDerivation rec {
pname = "yuzu";
version = "482";
src = fetchFromGitHub {
owner = "yuzu-emu";
repo = "yuzu-mainline"; # They use a separate repo for mainline “branch”
rev = "mainline-0-${version}";
sha256 = "1bhkdbhj1dv33qv0np26gzsw65p4z88whjmd6bc7mh2b5lvrjwxm";
fetchSubmodules = true;
{ branch ? "mainline", libsForQt5, fetchFromGitHub }:
let
inherit libsForQt5 fetchFromGitHub;
in {
mainline = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-mainline";
version = "517";
branchName = branch;
src = fetchFromGitHub {
owner = "yuzu-emu";
repo = "yuzu-mainline";
rev = "mainline-0-${version}";
sha256 = "0i73yl2ycs8p9cqn25rw35cll0l6l68605f1mc1qvf4zy82jggbb";
fetchSubmodules = true;
};
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [ qtbase qtwebengine qttools boost173 catch2 fmt lz4 nlohmann_json rapidjson zlib zstd SDL2 udev libusb1 libpulseaudio alsaLib sndio ecasound libjack2 libzip ffmpeg ]
++ lib.optionals useVulkan [ vulkan-loader vulkan-headers ];
cmakeFlags = [ "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" ]
++ lib.optionals (!useVulkan) [ "-DENABLE_VULKAN=No" ];
# Trick the configure system. This prevents a check for submodule directories.
preConfigure = "rm .gitmodules";
# Fix vulkan detection
postFixup = lib.optionals useVulkan ''
wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
'';
meta = with lib; {
homepage = "https://yuzu-emu.org";
description = "An experimental Nintendo Switch emulator written in C++";
license = with licenses; [
gpl2Plus
# Icons
cc-by-nd-30 cc0
];
maintainers = with maintainers; [ ivar joshuafern ];
platforms = platforms.linux;
early-access = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-ea";
version = "1377";
branchName = branch;
src = fetchFromGitHub {
owner = "pineappleEA";
repo = "pineapple-src";
rev = "EA-${version}";
sha256 = "0jjddmcqbkns5iqjwqh51hpjviw5j12n49jwfq7xwrsns6vbpqkf";
};
};
}
}.${branch}

View File

@ -752,6 +752,7 @@ mapAliases ({
xv = xxv; # added 2020-02-22
youtubeDL = youtube-dl; # added 2014-10-26
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
yuzu = yuzu-mainline; # added 2021-01-25
zdfmediathk = mediathekview; # added 2019-01-19
gnome_user_docs = gnome-user-docs; # added 2019-11-20
# spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell

View File

@ -29497,8 +29497,13 @@ in
yaxg = callPackage ../tools/graphics/yaxg {};
yuzu = libsForQt5.callPackage ../misc/emulators/yuzu {
stdenv = gcc10Stdenv;
yuzu-mainline = import ../misc/emulators/yuzu {
branch = "mainline";
inherit (pkgs) libsForQt5 fetchFromGitHub;
};
yuzu-ea = import ../misc/emulators/yuzu {
branch = "early-access";
inherit (pkgs) libsForQt5 fetchFromGitHub;
};
zap = callPackage ../tools/networking/zap { };