dolphin-emu-primehack: 1.0.6a -> 1.0.7a #307984
Conversation
SuperSamus
force-pushed
the
primehack-update
branch
from
21211d7 to
62f8958
Compare
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/3953 |
| nativeBuildInputs = [ | ||
| pkg-config | ||
| stdenv.cc |
There was a problem hiding this comment.
Isn't this already in nativeBuildInputs?
There was a problem hiding this comment.
It was added in #238959. I assume it was done for a reason...
Granted, PrimeHack isn't building on Darwin...
(I'll see if CI complains on regular Dolphin)
| fmt_10 | ||
| gtest | ||
| hidapi | ||
| libiconv |
There was a problem hiding this comment.
libiconv should only be required on darwin
There was a problem hiding this comment.
CMake looks for it in every OS.
https://github.com/dolphin-emu/dolphin/blob/cb71d849087c5b470b233b4f5c1ee9fde141483f/CMakeLists.txt#L721-L722
| fmt | ||
| xz | ||
| miniupnpc | ||
| #minizip-ng # Not wanting to make a mess with patches, leaving the vendored one for now |
There was a problem hiding this comment.
WDYM? Are there custom patches applied? We really don't want to use vendored libraries unless absolutely necessary.
There was a problem hiding this comment.
It's because I'm updating ./find-minizip-ng.patch on #307975, and I don't want to have two different patches.
(Also, there's no regression: it was vendored before, and the comment will remind me to properly add it when upstream fixes stuff, so that I only have to patch only upstream Dolphin, or neither of them)
| qtbase | ||
| qtsvg | ||
| #SDL2 # Not used yet |
There was a problem hiding this comment.
| #SDL2 # Not used yet |
There was a problem hiding this comment.
I'm assuming that, on PrimeHack's next version (which will be rebased on current Dolphin), someone (e.g., me) may forget to update the build inputs.
| # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version | ||
| #mgba # Derivation doesn't support Darwin |
There was a problem hiding this comment.
We could use an overlay
SuperSamus
force-pushed
the
primehack-update
branch
from
62f8958 to
13d3310
Compare
SuperSamus
force-pushed
the
primehack-update
branch
from
13d3310 to
88a101c
Compare
|
Anything I have to do to get this merged? |
wegank
added
the
2.status: merge conflict
|
Obsolete by #350053? |
Description of changes
https://github.com/shiiion/dolphin/releases/tag/1.0.7a
Unlike #300928, I'm keeping it divergent from regular Dolphin, as it often lags behind for a long time.
I admit it's a bit of a mess, since I'm leaving Darwin stuff here, even though it's broken. (Though it was also messy before, since it's basically a copy-paste of an older version of Dolphin.)
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.