dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

yuzu-{ea,mainline}: {1704,633} -> {1855,679}

Browse Source
This commit is contained in:
IvarWithoutBones 2021-07-07 03:59:15 +02:00
parent 7b75e40000
commit b017750441
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/misc/emulators/yuzu/base.nix
View File

@ -1,5 +1,5 @@
{ pname, version, src, branchName
, stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook
, stdenv, lib, wrapQtAppsHook
, cmake, pkg-config
, libpulseaudio, libjack2, alsa-lib, sndio
, vulkan-loader, vulkan-headers
@ -9,7 +9,7 @@
, glslang
, boost173
, catch2
, fmt
, fmt_8
, SDL2
, udev
, libusb1
@ -29,20 +29,13 @@ stdenv.mkDerivation rec {
glslang
boost173
catch2
fmt
fmt_8
SDL2
udev
libusb1
ffmpeg
];
patches = [
(fetchpatch { # Without this, yuzu tries to read version info from .git which is not present.
url = "https://raw.githubusercontent.com/pineappleEA/Pineapple-Linux/28cbf656e3188b80eda0031d0b2713708ecd630f/inject-git-info.patch";
sha256 = "1zxh5fwdr7jl0aagb3yfwd0995vyyk54f0f748f7c4rqvg6867fd";
})
];
cmakeFlags = [
"-DYUZU_USE_BUNDLED_QT=OFF"
"-DYUZU_USE_BUNDLED_SDL2=OFF"
@ -50,19 +43,20 @@ stdenv.mkDerivation rec {
"-DENABLE_QT_TRANSLATION=ON"
"-DYUZU_USE_QT_WEB_ENGINE=ON"
"-DUSE_DISCORD_PRESENCE=ON"
# Shows errors about not being able to find .git at runtime if you do not set these
"-DGIT_BRANCH=\"\""
"-DGIT_DESC=\"\""
];
# This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
# making the build fail, as that path does not exist
dontFixCmake = true;
preConfigure = ''
# Trick the configure system. This prevents a check for submodule directories.
rm -f .gitmodules
# see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work.
cmakeFlagsArray+=(
"-DTITLE_BAR_FORMAT_IDLE=\"yuzu ${branchName} ${version}\""
"-DTITLE_BAR_FORMAT_RUNNING=\"yuzu ${branchName} ${version} \| \{3\}\""
"-DTITLE_BAR_FORMAT_IDLE=yuzu ${branchName} ${version}"
"-DTITLE_BAR_FORMAT_RUNNING=yuzu ${branchName} ${version} | {3}"
)
'';
@ -87,5 +81,6 @@ stdenv.mkDerivation rec {
];
maintainers = with maintainers; [ ivar joshuafern ];
platforms = platforms.linux;
broken = stdenv.isAarch64; # Currently aarch64 is not supported.
};
}

8
pkgs/misc/emulators/yuzu/default.nix
View File

@ -4,25 +4,25 @@ let
in {
mainline = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-mainline";
version = "633";
version = "679";
branchName = branch;
src = fetchFromGitHub {
owner = "yuzu-emu";
repo = "yuzu-mainline";
rev = "mainline-0-${version}";
sha256 = "1zq20dd6x3kk179ls7y3mc5rj9vr73qs12bdj52bl3kscphxybf1";
sha256 = "1wkxkgfff5nn30mn2pqcrlsr7fja6bgaallsx1ainlcbamfyspcz";
fetchSubmodules = true;
};
};
early-access = libsForQt5.callPackage ./base.nix rec {
pname = "yuzu-ea";
version = "1704";
version = "1855";
branchName = branch;
src = fetchFromGitHub {
owner = "pineappleEA";
repo = "pineapple-src";
rev = "EA-${version}";
sha256 = "07pcldcmn8ammzbnxki6by7hgacr6z0548dvhv2p5lp9qcf3xz22";
sha256 = "0civ63zi23cym3kii4v3aiqrsg2zzj0w6sp6sa14ixysagqxsd4a";
};
};
}.${branch}