git.iko.soy/typeable/nixpkgs
on master help sign in
yuzu-{mainline,ea}: {517,1377} -> {546,1480}
commit593c5a89ea4d02927854aa619f97a9263dd6ebf9 authorIvarWithoutBones <ivar.scholten@protonmail.com> dateSun 21 Feb 2021, 23:00 (6 years ago) parentd733801
2 files changed+22−6
pkgs/misc/emulators/yuzu/base.nix+18−2 pkgs/misc/emulators/yuzu/default.nix+4−4
pkgs/misc/emulators/yuzu/base.nix+18−2
@@ -1,5 +1,5 @@
11{ pname, version, src, branchName
2−, stdenv, lib, fetchFromGitHub, wrapQtAppsHook
2+, stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook
33, cmake, pkg-config
44, libpulseaudio, libjack2, alsaLib, sndio, ecasound
55, vulkan-loader, vulkan-headers
@@ -36,15 +36,31 @@ stdenv.mkDerivation rec {
3636 ffmpeg
3737 ];
3838
39+ patches = [
40+ (fetchpatch { # Without this, yuzu tries to read version info from .git which is not present.
41+ url = "https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/28cbf656e3188b80eda0031d0b2713708ecd630f/inject-git-info.patch";
42+ sha256 = "1zxh5fwdr7jl0aagb3yfwd0995vyyk54f0f748f7c4rqvg6867fd";
43+ })
44+ ];
45+
3946 cmakeFlags = [
4047 "-DENABLE_QT_TRANSLATION=ON"
4148 "-DYUZU_USE_QT_WEB_ENGINE=ON"
4249 "-DUSE_DISCORD_PRESENCE=ON"
50+ # Shows errors about not being able to find .git at runtime if you do not set these
51+ "-DGIT_BRANCH=\"\""
52+ "-DGIT_DESC=\"\""
4353 ];
4454
45− # Trick the configure system. This prevents a check for submodule directories.
4655 preConfigure = ''
56+ # Trick the configure system. This prevents a check for submodule directories.
4757 rm -f .gitmodules
58+
59+ # see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work.
60+ cmakeFlagsArray+=(
61+ "-DTITLE_BAR_FORMAT_IDLE=\"yuzu ${branchName} ${version}\""
62+ "-DTITLE_BAR_FORMAT_RUNNING=\"yuzu ${branchName} ${version} \| \{3\}\""
63+ )
4864 '';
4965
5066 # Fix vulkan detection
pkgs/misc/emulators/yuzu/default.nix+4−4
@@ -4,25 +4,25 @@ let
44in {
55 mainline = libsForQt5.callPackage ./base.nix rec {
66 pname = "yuzu-mainline";
7− version = "517";
7+ version = "546";
88 branchName = branch;
99 src = fetchFromGitHub {
1010 owner = "yuzu-emu";
1111 repo = "yuzu-mainline";
1212 rev = "mainline-0-${version}";
13− sha256 = "0i73yl2ycs8p9cqn25rw35cll0l6l68605f1mc1qvf4zy82jggbb";
13+ sha256 = "0d6cbhp877xyjac1flkyjf6g6igzmvjlk6gcph4m04i4zivb9kf2";
1414 fetchSubmodules = true;
1515 };
1616 };
1717 early-access = libsForQt5.callPackage ./base.nix rec {
1818 pname = "yuzu-ea";
19− version = "1377";
19+ version = "1480";
2020 branchName = branch;
2121 src = fetchFromGitHub {
2222 owner = "pineappleEA";
2323 repo = "pineapple-src";
2424 rev = "EA-${version}";
25− sha256 = "0jjddmcqbkns5iqjwqh51hpjviw5j12n49jwfq7xwrsns6vbpqkf";
25+ sha256 = "0flc5mckmnr9gj8f78nh9nys96inlkqk3rvpgbpl0mhcg6lmlb2g";
2626 };
2727 };
2828}.${branch}