termite: Add support for macOS #43415
Merged
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 build termite |
|
Success on x86_64-linux (full log) Attempted: termite Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: termite Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: termite Partial log (click to expand)
|
dtzWill
reviewed
Jul 12, 2018
|
|
||
| postPatch = "sed '1i#include <math.h>' -i termite.cc"; | ||
| patches = [ ./url_regexp_trailing.patch | ||
| ] ++ lib.optional stdenv.isDarwin ./fix_macos.patch; |
There was a problem hiding this comment.
This makes the addition of the <errno.h> header conditional on using Darwin, please preserve the existing behavior :).
(I suppose either split up the patch or keep the sed line from before and use it unconditionally like we do now?)
There was a problem hiding this comment.
Whoops, in my tree I've had a copy of the math.h sed that adds errno.h-- I guess that didn't make it upstream?
Well my apologies about that, but would you be so kind as to add it unconditionally anyway? :)
Replace fetchgit with fetchFromGitHub now that it supports fetching submodules. Remove unnecessary postPatch to add <math.h> as termite already includes <cmath>. Add a patch to include <errno.h> on all platforms and remove the --as-needed flag from ld on macOS.
Enzime
force-pushed
the
patch/termite-on-darwin
branch
from
cf888f2
to
efe5815
Compare
|
@GrahamcOfBorg build termite |
|
Success on x86_64-darwin (full log) Attempted: termite Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: termite Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: termite Partial log (click to expand)
|
|
regarding the errno header patch: is this actually Nix related? Otherwise we should file a patch upstream right? |
|
@Ma27 I believe it's macOS related, I will file an upstream patch later and if it gets merged I'll remove the patch from Nixpkgs. |
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.
Replace fetchgit with fetchFromGitHub now that it supports fetching
submodules. Remove unnecessary postPatch to add <math.h> as termite
already includes . Add a patch to include <errno.h> and remove
the --as-needed flag from ld on macOS.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)