ttyrec: fix build on Darwin #27500
Merged
ttyrec: fix build on Darwin #27500
+2
−2
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
copumpkin
reviewed
Jul 19, 2017
| @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| patches = [ ./clang-fixes.patch ]; | |||
|
|
|||
| makeFlags = [ "CFLAGS=-DSVR4" ] | |||
| makeFlags = stdenv.lib.optional buildPlatform.isLinux "CFLAGS=-DSVR4" | |||
There was a problem hiding this comment.
Is this really a buildPlatform thing? cc @Ericson2314 who knows best 😄
There was a problem hiding this comment.
I think it should be hostPlatform though.
There was a problem hiding this comment.
When in doubt, hostPlatform. We can't really test to prove until I get more cross stuff working, but yeah let's change it.
There was a problem hiding this comment.
Sorry I mixed this up, guys. I'll reread the docs before the next time I try to use it.
There was a problem hiding this comment.
@therealpxc I am mainly pleased people are figuring out about *Platform at all :). This is new to most, so no worries.
[Also, one can now do stdenv.*Platform.is*, if you don't want to add the additional parameter.]
bugworm
pushed a commit
to bugworm/nixpkgs
that referenced
this pull request
Jul 23, 2017
* ttyrec: fix build on Darwin * ttyrec: remove pointless empty list
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
ttyrec doesn't build on Darwin
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)