tldr: add support for darwin #44384
Merged
tldr: add support for darwin #44384
+6
−4
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
6.topic: darwin
matthewbauer
reviewed
Aug 3, 2018
pkgs/tools/misc/tldr/default.nix
Outdated
| @@ -11,9 +11,14 @@ stdenv.mkDerivation rec { | |||
| sha256 = "10ylpiqc06p0qpma72vwksd7hd107s0vlx9c6s9rz4vc3i274lb6"; | |||
| }; | |||
|
|
|||
| buildInputs = [ curl clang libzip ]; | |||
| buildInputs = [ git curl clang libzip ]; | |||
There was a problem hiding this comment.
Git should be left out. It is just used for getting the tag which won't work here because fetchFromGitHub leaves out the .git directory.
There was a problem hiding this comment.
Thanks for the pointer 😄
matthewbauer
reviewed
Aug 3, 2018
pkgs/tools/misc/tldr/default.nix
Outdated
| nativeBuildInputs = [ pkgconfig ]; | ||
|
|
||
| preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' | ||
| substituteInPlace Makefile --replace "gcc" "$CC" |
There was a problem hiding this comment.
I think you can also do makeFlags = [ "CC=$CC" ];
There was a problem hiding this comment.
I tried and can't get it work using makeFlags :/ Thanks!
|
Thanks for the review @matthewbauer. See new commit. Cheers |
matthewbauer
approved these changes
Aug 3, 2018
|
@GrahamcOfBorg build tldr |
|
Success on aarch64-linux (full log) Attempted: tldr Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: tldr Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: tldr Partial log (click to expand)
|
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
Adds darwin support for
tldr. Also fixes warning due to git being missing.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)