3 files changed, 33 insertions, 12 deletions
diff --git a/pkgs/misc/emulators/yuzu/base.nix b/pkgs/misc/emulators/yuzu/base.nix
index 257407b1949b9..89c8f2cd94746 100644
--- a/pkgs/misc/emulators/yuzu/base.nix
+++ b/pkgs/misc/emulators/yuzu/base.nix
@@ -1,6 +1,6 @@
-{ pname, version, src, branch
-, stdenv, fetchFromGitHub, wrapQtAppsHook
-, cmake, pkgconfig
+{ pname, version, src, branchName
+, stdenv, lib, fetchFromGitHub, wrapQtAppsHook
+, cmake, pkg-config
 , libpulseaudio, libjack2, alsaLib, sndio, ecasound
 , vulkan-loader, vulkan-headers
 , qtbase, qtwebengine, qttools
@@ -19,7 +19,7 @@
 stdenv.mkDerivation rec {
   inherit pname version src;
 
-  nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
+  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
   buildInputs = [
     libpulseaudio libjack2 alsaLib sndio ecasound
     vulkan-loader vulkan-headers
@@ -36,10 +36,16 @@ stdenv.mkDerivation rec {
     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.
-  preConfigure = "rm -f .gitmodules";
+  preConfigure = ''
+    rm -f .gitmodules
+  '';
 
   # Fix vulkan detection
   postFixup = ''
@@ -47,9 +53,9 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     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 = ''
       An experimental Nintendo Switch emulator written in C++.
       Using the mainline branch is recommanded for general usage.
diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/misc/emulators/yuzu/default.nix
index 6a4be69a1dc65..89a500bb313c2 100644
--- a/pkgs/misc/emulators/yuzu/default.nix
+++ b/pkgs/misc/emulators/yuzu/default.nix
@@ -1,11 +1,11 @@
-{ branch ? "mainline", pkgs }:
+{ branch ? "mainline", libsForQt5, fetchFromGitHub }:
 let
-  inherit (pkgs) libsForQt5 fetchFromGitHub;
+  inherit libsForQt5 fetchFromGitHub;
 in {
   mainline = libsForQt5.callPackage ./base.nix rec {
     pname = "yuzu-mainline";
     version = "517";
-    branch = branch;
+    branchName = branch;
     src = fetchFromGitHub {
       owner = "yuzu-emu";
       repo = "yuzu-mainline";
@@ -14,4 +14,15 @@ in {
       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}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1cc88e2f337a..1575caca165fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29413,7 +29413,11 @@ in
 
   yuzu-mainline = import ../misc/emulators/yuzu {
     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 { };