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

gcc10: fix MinGW build & use local copy of mcfgthread patches #107978

Merged
merged 1 commit into from Jan 4, 2021
Merged

gcc10: fix MinGW build & use local copy of mcfgthread patches #107978

merged 1 commit into from Jan 4, 2021

Conversation

kira-bruneau
Copy link
Contributor

@kira-bruneau kira-bruneau commented Dec 30, 2020 •
edited

Motivation for this change

Fixes #107886.

@Ericson2314 @matthewbauer What do you think of this approach that keeps a local copy? See #107918 for previous discussion.

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.

@Synthetica9

@kira-bruneau kira-bruneau changed the title gcc10: fix gcc10 MinGW build & use local copy of mcfgthread patches gcc10: fix MinGW build & use local copy of mcfgthread patches Dec 30, 2020
@matthewbauer
Copy link
Member

Can you remove "mfcgthreads-patches-repo.nix" as well?

@kira-bruneau
Copy link
Contributor Author

@matthewbauer Yep, it was already removed. When I was doing a self review I almost missed the change too 😅

Ericson2314
Ericson2314 approved these changes Dec 31, 2020
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment •
edited

Choose a reason for hiding this comment

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

LGTM, but can we add a note in the update script saying master is force-pushed, hence why we do things this way?

@kira-bruneau
Copy link
Contributor Author

kira-bruneau commented Jan 4, 2021 •
edited

@avnik Since #107783 was merged before this fix, mingwSupport for wine is now broken on master, but it should be okay to enable by default after this is merged. Then #103102 can be closed.

@Ericson2314 Ericson2314 merged commit 83f7410 into NixOS:master Jan 4, 2021
@kira-bruneau kira-bruneau deleted the gcc10 branch January 4, 2021 05:03
@avnik
Copy link
Contributor

avnik commented Jan 4, 2021

@MetaDark not in next week or two definitely ;) I like to have wine 6.0 released (and merged) first as a next stable.

@flokli flokli mentioned this pull request Jan 10, 2021
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer approved these changes

@Ericson2314 Ericson2314 Ericson2314 approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

GCC 10 doesn't build for any MinGW configuration
4 participants
@kira-bruneau @matthewbauer @avnik @Ericson2314