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

Jump to bottom

tk: add missing headers for Darwin #62125

Merged
merged 1 commit into from May 27, 2019
Merged

tk: add missing headers for Darwin #62125

merged 1 commit into from May 27, 2019

Conversation

kalbasit
Copy link
Member

@kalbasit kalbasit commented May 27, 2019 •
edited

Motivation for this change

This PR adds the missing headers to tk, which are used to build tix.

In file included from ./generic/tixInputO.c:17:
In file included from private_headers/generic/tkInt.h:19:
private_headers/generic/tkPort.h:25:11: fatal error: 'tkMacOSXPort.h' file not found
#       include "tkMacOSXPort.h"
                ^~~~~~~~~~~~~~~~
1 error generated.
make: *** [Makefile:294: tixInputO.o] Error 1
builder for '/nix/store/4m3ibf7zdkx658rbd3082c1dn67sb4wc-tix-8.4.3.drv' failed with exit code 2
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label May 27, 2019
@ofborg ofborg bot requested review from vrthra and lovek323 May 27, 2019 17:37
@kalbasit kalbasit marked this pull request as ready for review May 27, 2019 18:26
@kalbasit
Copy link
Member Author

@GrahamcOfBorg build tcl tk

@kalbasit
Copy link
Member Author

@GrahamcOfBorg build tix

@kalbasit
Copy link
Member Author

This is not broken in 19.03. No need to backport.

@kalbasit kalbasit merged commit 915085c into NixOS:master May 27, 2019
@kalbasit kalbasit deleted the nixpkgs_fix-tk-on-darwin branch May 27, 2019 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vrthra vrthra Awaiting requested review from vrthra

@lovek323 lovek323 Awaiting requested review from lovek323

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@kalbasit