yuzu-ea: init at 1377

This commit is contained in:
IvarWithoutBones 2021-01-25 19:34:06 +01:00
parent d66c499890
commit 44f4a61fc7
3 changed files with 33 additions and 12 deletions

View File

@ -1,6 +1,6 @@
{ pname, version, src, branch { pname, version, src, branchName
, stdenv, fetchFromGitHub, wrapQtAppsHook , stdenv, lib, fetchFromGitHub, wrapQtAppsHook
, cmake, pkgconfig , cmake, pkg-config
, libpulseaudio, libjack2, alsaLib, sndio, ecasound , libpulseaudio, libjack2, alsaLib, sndio, ecasound
, vulkan-loader, vulkan-headers , vulkan-loader, vulkan-headers
, qtbase, qtwebengine, qttools , qtbase, qtwebengine, qttools
@ -19,7 +19,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname version src; inherit pname version src;
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [ buildInputs = [
libpulseaudio libjack2 alsaLib sndio ecasound libpulseaudio libjack2 alsaLib sndio ecasound
vulkan-loader vulkan-headers vulkan-loader vulkan-headers
@ -36,10 +36,16 @@ stdenv.mkDerivation rec {
ffmpeg ffmpeg
]; ];
cmakeFlags = [ "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" ]; 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. # Trick the configure system. This prevents a check for submodule directories.
preConfigure = "rm -f .gitmodules"; preConfigure = ''
rm -f .gitmodules
'';
# Fix vulkan detection # Fix vulkan detection
postFixup = '' postFixup = ''
@ -47,9 +53,9 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
''; '';
meta = with stdenv.lib; { meta = with lib; {
homepage = "https://yuzu-emu.org"; homepage = "https://yuzu-emu.org";
description = "The ${branch} branch of an experimental Nintendo Switch emulator written in C++"; description = "The ${branchName} branch of an experimental Nintendo Switch emulator written in C++";
longDescription = '' longDescription = ''
An experimental Nintendo Switch emulator written in C++. An experimental Nintendo Switch emulator written in C++.
Using the mainline branch is recommanded for general usage. Using the mainline branch is recommanded for general usage.

View File

@ -1,11 +1,11 @@
{ branch ? "mainline", pkgs }: { branch ? "mainline", libsForQt5, fetchFromGitHub }:
let let
inherit (pkgs) libsForQt5 fetchFromGitHub; inherit libsForQt5 fetchFromGitHub;
in { in {
mainline = libsForQt5.callPackage ./base.nix rec { mainline = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-mainline"; pname = "yuzu-mainline";
version = "517"; version = "517";
branch = branch; branchName = branch;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yuzu-emu"; owner = "yuzu-emu";
repo = "yuzu-mainline"; repo = "yuzu-mainline";
@ -14,4 +14,15 @@ in {
fetchSubmodules = true; fetchSubmodules = true;
}; };
}; };
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} }.${branch}

View File

@ -29413,7 +29413,11 @@ in
yuzu-mainline = import ../misc/emulators/yuzu { yuzu-mainline = import ../misc/emulators/yuzu {
branch = "mainline"; branch = "mainline";
inherit pkgs; inherit (pkgs) libsForQt5 fetchFromGitHub;
};
yuzu-ea = import ../misc/emulators/yuzu {
branch = "early-access";
inherit (pkgs) libsForQt5 fetchFromGitHub;
}; };
zap = callPackage ../tools/networking/zap { }; zap = callPackage ../tools/networking/zap { };