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

Fix Nix macOS build #11175

Merged
merged 1 commit into from
Jan 11, 2021
Merged

Fix Nix macOS build #11175

merged 1 commit into from
Jan 11, 2021

Conversation

pepyakin
Copy link

Description

For me, on macOS 10.15.7 running make would fail with errors about -iframework. This change fixes it. I assume that the name of the flag has been changed.

I haven't checked this change on a linux platform. Would appreciate if somebody did.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@fauxpark
Copy link
Member

@purcell thoughts?

@fauxpark fauxpark requested a review from a team December 10, 2020 16:14
@zvecr zvecr changed the title Fix macOS build Fix Nix macOS build Dec 10, 2020
Copy link
Contributor

@purcell purcell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this fix is appropriate and good: I can reproduce the error locally, and this resolves it.

@purcell
Copy link
Contributor

purcell commented Dec 10, 2020

Actually, hold off on merging -- just a couple more things to test first.

@purcell
Copy link
Contributor

purcell commented Dec 10, 2020

Yeah, this is good to go -- thanks @pepyakin!

I have a further fix to submit which fixes compilation on Big Sur, so expect a fresh PR soon.

@fauxpark fauxpark requested a review from a team December 10, 2020 22:59
@jrolfs
Copy link

jrolfs commented Dec 20, 2020

Just ran into this as well and was about to open a PR, but I'm glad I searched first :) Let me know if I can help test anything.

@purcell
Copy link
Contributor

purcell commented Dec 21, 2020

Relatedly thinking it might be nice to set up a Cachix cache, and then have a build job which populates it. This way, us Nix users downstream can mostly avoid compiling avr-gcc locally, and there would also be a specific build check to verify that changes like this one do not contain significant regressions.

@purcell
Copy link
Contributor

purcell commented Dec 21, 2020

P.S. See also #11181, which fixes the Nix shell for Big Sur users.

@pepyakin
Copy link
Author

pepyakin commented Jan 8, 2021

Hey all, is there anything I can do to move this and #11181 forward?

shell.nix Show resolved Hide resolved
@skullydazed skullydazed merged commit e941f04 into qmk:master Jan 11, 2021
@pepyakin pepyakin deleted the fix-macos branch January 11, 2021 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants