-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #228872 from K900/weird-fruit
yuzu: update, switch to qt6, clean up, etc
- Loading branch information
Showing
5 changed files
with
179 additions
and
164 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,68 @@ | ||
| { branch ? "mainline" | ||
| , libsForQt5 | ||
| , qt6Packages | ||
| , fetchFromGitHub | ||
| , fetchgit | ||
| , fetchurl | ||
| , fetchzip | ||
| , runCommand | ||
| , gnutar | ||
| }: | ||
|
|
||
| let | ||
| # Mirror of https://api.yuzu-emu.org/gamedb, last updated 2022-08-13 | ||
| # Please make sure to update this when updating yuzu! | ||
| sources = import ./sources.nix; | ||
|
|
||
| compat-list = fetchurl { | ||
| name = "yuzu-compat-list"; | ||
| url = "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/d83401d2ee3fd5e1922e31baed1f3bdb1c0f036c/compatibility_list.json"; | ||
| sha256 = "sha256-anOmO7NscHDsQxT03+YbJEyBkXjhcSVGgKpDwt//GHw="; | ||
| url = "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/${sources.compatList.rev}/compatibility_list.json"; | ||
| hash = sources.compatList.hash; | ||
| }; | ||
| in { | ||
| mainline = libsForQt5.callPackage ./generic.nix rec { | ||
| pname = "yuzu-mainline"; | ||
| version = "1245"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "yuzu-emu"; | ||
| repo = "yuzu-mainline"; | ||
| rev = "mainline-0-${version}"; | ||
| sha256 = "sha256-lWXlY1KQC067MvCRUFhmr0c7KDrHDuwJOhIWMKw1f+A="; | ||
| fetchSubmodules = true; | ||
| }; | ||
|
|
||
| inherit branch compat-list; | ||
|
|
||
| mainlineSrc = fetchFromGitHub { | ||
| owner = "yuzu-emu"; | ||
| repo = "yuzu-mainline"; | ||
| rev = "mainline-0-${sources.mainline.version}"; | ||
| hash = sources.mainline.hash; | ||
| fetchSubmodules = true; | ||
| }; | ||
|
|
||
| # The mirror repo for early access builds is missing submodule info, | ||
| # but the Windows distributions include a source tarball, which in turn | ||
| # includes the full git metadata. So, grab that and rehydrate it. | ||
| # This has the unfortunate side effect of requiring two FODs, one | ||
| # for the Windows download and one for the full repo with submodules. | ||
| eaZip = fetchzip { | ||
| name = "yuzu-ea-windows-dist"; | ||
| url = "https://github.com/pineappleEA/pineapple-src/releases/download/EA-${sources.ea.version}/Windows-Yuzu-EA-${sources.ea.version}.zip"; | ||
| hash = sources.ea.distHash; | ||
| }; | ||
|
|
||
| early-access = libsForQt5.callPackage ./generic.nix rec { | ||
| pname = "yuzu-ea"; | ||
| version = "2945"; | ||
| eaGitSrc = runCommand "yuzu-ea-dist-unpacked" { | ||
| src = eaZip; | ||
| nativeBuildInputs = [ gnutar ]; | ||
| } | ||
| '' | ||
| mkdir $out | ||
| tar xf $src/*.tar.xz --directory=$out --strip-components=1 | ||
| ''; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "pineappleEA"; | ||
| repo = "pineapple-src"; | ||
| rev = "EA-${version}"; | ||
| sha256 = "sha256-/051EtQxhB5oKH/JxZZ2AjnxOBcRxCBIwd4Qr8lq7Ok="; | ||
| fetchSubmodules = true; | ||
| }; | ||
| eaSrcRehydrated = fetchgit { | ||
| url = eaGitSrc; | ||
| fetchSubmodules = true; | ||
| hash = sources.ea.fullHash; | ||
| }; | ||
|
|
||
| in { | ||
| mainline = qt6Packages.callPackage ./generic.nix { | ||
| branch = "mainline"; | ||
| version = sources.mainline.version; | ||
| src = mainlineSrc; | ||
| inherit compat-list; | ||
| }; | ||
|
|
||
| inherit branch compat-list; | ||
| early-access = qt6Packages.callPackage ./generic.nix { | ||
| branch = "early-access"; | ||
| version = sources.ea.version; | ||
| src = eaSrcRehydrated; | ||
| inherit compat-list; | ||
| }; | ||
| }.${branch} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # Generated by ./update.sh - do not update manually! | ||
| # Last updated: 2023-05-05 | ||
| { | ||
| compatList = { | ||
| rev = "773d28cbc699427c8baa427452d7b229920eec59"; | ||
| hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; | ||
| }; | ||
|
|
||
| mainline = { | ||
| version = "1421"; | ||
| hash = "sha256:1ldxframs7a8rmna9ymyx20n89594q0d1266kr7ah8yvh1gp04r3"; | ||
| }; | ||
|
|
||
| ea = { | ||
| version = "3557"; | ||
| distHash = "sha256:0bddx5d88cfaaqbzr59w9kqjjsf9xvgvdn1g0l9w3ifr9zc2vlwr"; | ||
| fullHash = "sha256:0w1ji3a8iridh4dpyal8lscgwddf9pwz1pfigksmvbn8mm9d9xwl"; | ||
| }; | ||
| } |
Oops, something went wrong.