-
-
Notifications
You must be signed in to change notification settings - Fork 15.5k
pcsx2: update deps needed by upstream #103461
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
130be09
to
45897bc
Compare
The build fails with |
45897bc
to
bce927d
Compare
@samuelgrf ah right, we only added support for system fmt 3 days ago: PCSX2/pcsx2#3838, before that we ended up using a baked in one. This derivation should still work with the baked in fmt though: The build failed before that because I forgot to add myself to maintainers-list.nix |
bce927d
to
d046c43
Compare
Ah, seems like you have sandboxing disabled, the build otherwise fails because there's no network connection. |
d046c43
to
352be9e
Compare
352be9e
to
8e6214e
Compare
Sorry for the delay, @samuelgrf I realized I tested on a path that already had submodules, which the fetchGithub one did not have, so that was unrelated to the sandboxing. As a matter of fact the repository already had submodules so it's a wonder this went unnoticed for so long. I went ahead and rebased + updated the fetch git. This should be good to merge for now, until we switch to a builtin system fmt. |
8e6214e
to
04478cb
Compare
Hi @GovanifY, Thanks for the changes. Great to have an upstream maintainer on board 👍 Just two more things that can be fixed with one interactive rebase (
|
04478cb
to
8519315
Compare
Thanks for the guidance @hrdinka , this should now be good to go! |
Great, I will merge it when ofborg has finished! |
8519315
to
9389496
Compare
@samuelgrf this should take care of that, although pcsx2 currently requires a specific fmt version. I'll think about removing this version check and simply ensuring major versions sync on upstream later. |
Anything else I need to do before merging this? |
9389496
to
6c861dc
Compare
@samuelgrf As explained in the comments of your review I kept the fetchSubmodules since the current repository already used submodules in some cases and we might introduce more in the future. |
Great that we got this done, thanks to everyone 👍 |
Motivation for this change
Upstream now requires more mandatory dependencies. As one of the core developer of upstream I also added myself as a maintainer.
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)