init bulletml and rrootage #35482
Merged
init bulletml and rrootage #35482
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
GrahamcOfBorg
added
8.has: package (new)
10.rebuild-linux: 1-10
and removed
10.rebuild-linux: 0
labels
|
@GrahamcOfBorg build bulletml rrootage |
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
Mic92
reviewed
Mar 4, 2018
| (debianPatch "warnings" "18px79x4drvm6dy6w6js53nzlyvha7qaxhz5a99b97pyk3qc7i9g") | ||
| (debianPatch "makefile" "0z6yxanxmarx0s08gh12pk2wfqjk8g797wmfcqczdv1i6xc7nqzp") | ||
| (debianPatch "includes" "1n11j5695hs9pspslf748w2cq5d78s6bwhyl476wp6gcq6jw20bw") | ||
| (debianPatch "get-rid-of-boost" "1wc8jxlxmdx53mhgx55wzysxxbbrdmq6dpfbb8rrrbkdz5b59hjm") |
There was a problem hiding this comment.
Have those patches been reviewed if they apply to Nixos as well?
There was a problem hiding this comment.
Not individually. I know that without them it does not compile and with all of them it works fine. I'll review them one by one and remove the unnecessary ones.
Mic92
reviewed
Mar 4, 2018
| sha256 = "01zzg4ih3kmbhsn1p9zr7g8srv1d2dhrp8cdd86y9qq233idnkln"; | ||
| }; | ||
|
|
||
| patches = [ |
There was a problem hiding this comment.
I'm checking right now, but I'm unsure about some.
For example removing this patch seems to have no effect on the runtime behavior of rrootage, but looking at the description it makes sense to include it anyway.
What do you think I should do?
There was a problem hiding this comment.
Or the "high res by default" patch or the "windowed mode" patch, which are both really useful but not strictly necessary
There was a problem hiding this comment.
@Mic92 ping?
Maybe I should just fork that repository and apply those patches...
|
Success on aarch64-linux (full log) Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Partial log (click to expand)
|
matthewbauer
requested changes
Apr 25, 2018
|
@matthewbauer I can't see the full log. I think it got deleted. I only see |
|
@GrahamcOfBorg build bulletml rrootage |
|
Failure on x86_64-darwin (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
Mic92
reviewed
May 7, 2018
| (debianPatch "get-rid-of-boost" "1wc8jxlxmdx53mhgx55wzysxxbbrdmq6dpfbb8rrrbkdz5b59hjm") | ||
| ]; | ||
|
|
||
| makeFlags = [ "-C src" ]; |
There was a problem hiding this comment.
Adding "CC=c++" to makeFlags hopefully fixes the macOS build.
fgaz
force-pushed
the
kenta-cho
branch
2 times, most recently
from
b46e8bf
to
c0e23d4
Compare
|
@Mic92 could you trigger a rebuild? |
|
@GrahamcOfBorg build bulletml rrootage |
|
Failure on x86_64-darwin (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
Mic92
reviewed
May 8, 2018
|
|
||
| makeFlags = [ | ||
| "-C src" | ||
| "CC=c++" # Needed for darwin |
There was a problem hiding this comment.
My bad CXX=c++ and CC=cc hopefully produce better results.
|
@GrahamcOfBorg build bulletml rrootage |
|
Failure on x86_64-darwin (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Looks good to me now. If you could squash my trial and errors back into the bulletml commit this pull request should be good to go. |
|
Ah no. now we see more c++ legacy stuff: cuberite/cuberite#424 |
|
cuberite/cuberite#464 (comment) seems to suggest exporting those values rather than passing them to make... is that the same thing? Or maybe we should patch the c file like cuberite/cuberite#424 (comment) |
|
environment or not is the same thing in make. |
|
Patch it is then |
|
I just discovered that it was the remove-boost debian patch that introduced the tr1/memory include. I removed that patch and installed the boost files too. Could you try to rebuild now, @Mic92 ? |
|
@GrahamcOfBorg build bulletml rrootage |
|
Failure on x86_64-darwin (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
The x86_64-linux failure is spurious. darwin says |
|
@Mic92 last try, could you trigger a rebuild? If that fails can we merge this as is? Maybe with platforms=linux and a comment referencing this discussion. Without a darwin machine to edit-test-iterate this on, fixing it is a long and painful process |
|
I'm not even sure if that builtins.currentSystem comparison does what I think it does |
|
@GrahamcOfBorg build bulletml rrootage |
|
Success on x86_64-linux (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: bulletml, rrootage Partial log (click to expand)
|
|
Then please disable macOS as platform. |
fgaz
force-pushed
the
kenta-cho
branch
2 times, most recently
from
4febc9c
to
3455420
Compare
|
@Mic92 done & removed the commits relevant to darwin. For anyone that comes across this and wants to fix the darwin build here's what was tried: + postPatch = if builtins.currentSystem == stdenv.lib.platforms.darwin
+ then "substituteInPlace Makefile --replace soname install_name"
+ else null;
makeFlags = [
"-C src"
+ # Needed for darwin
+ "CC=cc"
+ "CXX=c++"
+ "LD=c++"
];But the currentSystem comparison is always false for some reason |
This was referenced Jun 4, 2021
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
I'm packaging some of the awesome games by Kenta Cho. This is the first.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)