mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-25 13:35:13 +00:00
Merge pull request #243777 from leiserfg/yuzu-ea-3737
yuzu-ea: 3702 -> 3783, yuzu-mainline: 1475 -> 1513
This commit is contained in:
commit
3a061babe6
@ -110,7 +110,7 @@ in stdenv.mkDerivation {
|
||||
# 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;
|
||||
|
||||
patches = [./vulkan_version.patch];
|
||||
cmakeFlags = [
|
||||
# actually has a noticeable performance impact
|
||||
"-DYUZU_ENABLE_LTO=ON"
|
||||
|
@ -1,19 +1,19 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2023-06-22
|
||||
# Last updated: 2023-07-31
|
||||
{
|
||||
compatList = {
|
||||
rev = "2288f79cad3be4c2c3148435372958aebea33156";
|
||||
rev = "c40af830523cf820b6a391a3ef420bcc1b68b367";
|
||||
hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
|
||||
};
|
||||
|
||||
mainline = {
|
||||
version = "1475";
|
||||
hash = "sha256:1948lqk89k7b48skcikjx3i3f8nwb6n6sh2bf00qqbchr8i27gpm";
|
||||
version = "1513";
|
||||
hash = "sha256:0mqrdsl55aimm39rws7ap6rw9qq6m4pzp7zlyvp3dchh1x58zzgq";
|
||||
};
|
||||
|
||||
ea = {
|
||||
version = "3702";
|
||||
distHash = "sha256:178mfg7rxr1372favkkizdcjv1ckfkzmjqfpw6ja3c5kv0psv19j";
|
||||
fullHash = "sha256:00ls667l8zaj8597saw6drd28x4k02iqh3l7rxjjxkcqny6qv6p8";
|
||||
version = "3783";
|
||||
distHash = "sha256:01prkdximgypikgggq2y53hlpf7gmg1z7zfbc9yi18f6s5cncs18";
|
||||
fullHash = "sha256:0pggknr2sxlc3pdy3jh423318z8rr8f0iz43zw85qwhqnj1h9q19";
|
||||
};
|
||||
}
|
||||
|
13
pkgs/applications/emulators/yuzu/vulkan_version.patch
Normal file
13
pkgs/applications/emulators/yuzu/vulkan_version.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Yuzu requires a version of Vulkan that has not yet been released as a stable Vulkan SDK. In case this patch fails, check which version Yuzu is currently using and verify that it still works with the version shipped in Nixpkgs.
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -314,7 +314,7 @@
|
||||
find_package(zstd 1.5 REQUIRED)
|
||||
|
||||
if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
|
||||
- find_package(Vulkan 1.3.256 REQUIRED)
|
||||
+ find_package(Vulkan 1.3.250 REQUIRED)
|
||||
endif()
|
||||
|
||||
if (ENABLE_LIBUSB)
|
Loading…
Reference in New Issue
Block a user