Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git: use tcl/tk from nixpkgs on darwin #81521

Merged
merged 2 commits into from Mar 28, 2020

Conversation

thefloweringash
Copy link
Member

Motivation for this change

Fix git gui on Darwin. Currently startup fails with:

Error in startup script: invalid bareword "test"
in expression "test";
should be "$test" or "{test}" or "test(...)" or ...
    (parsing expression "test")
    invoked from within
"if test "z$*" = zversion ||"
    (file "/nix/store/8gac829ncp7dizssgarbg73wilir5sxg-git-2.25.1/libexec/git-core/git-gui" line 2)

This is a replacement for #79769 (reverted here).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@thefloweringash
Copy link
Member Author

cc @virusdave and @LnL7 who worked on #79769

@virusdave
Copy link
Contributor

virusdave commented Mar 27, 2020

This is a much better fix than mine, thanks for finding and porting it! I'm building it now, will report results.

@virusdave
Copy link
Contributor

Yup, this built just fine and worked on each of my different macos versions! Much better, merge it!

@LnL7 @worldofpeace

@LnL7 LnL7 merged commit c4ecf64 into NixOS:staging Mar 28, 2020
@thefloweringash thefloweringash deleted the git-gui-darwin branch April 15, 2020 09:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants