dolphinEmuMaster: Enable Darwin building #31546
Closed
Conversation
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
lukeadams
force-pushed
the
dolphin-master-darwin-enable
branch
2 times, most recently
from
27dbea3
to
a777641
Compare
matthewbauer
approved these changes
Nov 13, 2017
LnL7
reviewed
Nov 13, 2017
|
|
||
| enableParallelBuilding = true; | ||
|
|
||
| nativeBuildInputs = [ pkgconfig ]; | ||
| buildInputs = [ gcc cmake bluez ffmpeg libao mesa gtk2 glib pcre | ||
| nativeBuildInputs = [ cmake gcc pkgconfig ]; |
| @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { | |||
| sha256 = "042q1l4708zjn5v72sa9qdvgx173kmy4hbcd23wj5vqd6vbmk6d9"; | |||
| }; | |||
|
|
|||
| nativeBuildInputs = [ perl ]; | |||
| nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; | |||
|
|
|||
| patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' | |||
| substituteInPlace library/Makefile --replace "-soname" "-install_name" | |||
There was a problem hiding this comment.
fixing the install_name here to use the absolute store path should allow us to get rid of the postInstall patching.
| , common | ||
| }: | ||
|
|
||
| common.overrideDerivation (super : rec { |
There was a problem hiding this comment.
not sure about using overrideDerivation in of nixpkgs
There was a problem hiding this comment.
Yeah... on second thought the override should be in top-level like this:
wxGTK31 = wxGTK30.overrideDerivation (super : rec {
...
)};
Or are you saying override should be avoided entirely? It seems to be used a handful of times in top-level.
lukeadams
force-pushed
the
dolphin-master-darwin-enable
branch
from
a777641
to
743c75e
Compare
GrahamcOfBorg
added
10.rebuild-darwin: 1-10
10.rebuild-linux: 1-10
and removed
10.rebuild-darwin: 11-100
10.rebuild-linux: 11-100
labels
|
lukeadams
force-pushed
the
dolphin-master-darwin-enable
branch
from
743c75e
to
dd4a1ca
Compare
lukeadams
force-pushed
the
dolphin-master-darwin-enable
branch
2 times, most recently
from
d18344e
to
f215ede
Compare
added 8 commits
December 18, 2017 17:15
wxgtk31: overrideattrs
- add Darwin inputs - Add curl to prevent in-tree build - add libpng hidapi wxgtk for dolphin to use
lukeadams
force-pushed
the
dolphin-master-darwin-enable
branch
from
f215ede
to
f6d415a
Compare
|
|
Thanks for your patience, been meaning to check out this PR for some time. I went through the changes and it all looks good to me, I also tested the changes on my NixOS machine and Dolphin is working well. Pushed to master! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This PR enables Darwin building for Dolphin.
Things done
It also adds the required WXGTK31 package and cleans up how we patch mbedtls on darwin.
Dolphin generates an application bundle instead of a binary in bin on Darwin, but I can add a symlink to the binary if needed.
Potential improvement: go through the list of External deps and use nix-provided ones to reduce the binary size.
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)