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

qt512: fix darwin patches #108115

Merged
merged 2 commits into from Jan 1, 2021
Merged

qt512: fix darwin patches #108115

merged 2 commits into from Jan 1, 2021

Conversation

ttuegel
Copy link
Member

@ttuegel ttuegel commented Jan 1, 2021

Motivation for this change

The patches for Qt 5.12 on Darwin no longer apply. Although I cannot test the build on macOS, I can make the Darwin patches apply on all platforms because the patches target only platform-specific files.

See also: #107483 (comment)

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.

prusnak
prusnak approved these changes Jan 1, 2021
View reviewed changes
Copy link
Member

@prusnak prusnak left a comment •
edited

Choose a reason for hiding this comment

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

I confirmed the patches do not apply on master when run on darwin (i.e. we need this PR to fix the build failure on master).
I confirmed the patches do apply in a61f20e when run on darwin and qt512 starts to build on darwin.
I have not tested the full build on darwin.

@prusnak prusnak added the 9.needs: port to stable A PR needs a backport to the stable release. label Jan 1, 2021
@ttuegel
Copy link
Member Author

ttuegel commented Jan 1, 2021

I'm still waiting on nixpkgs-review to verify that all the dependent packages build.

@r-burns
Copy link
Contributor

r-burns commented Jan 1, 2021

Have not tested all deps, but this unblocks qtmultimedia 👍

@r-burns r-burns mentioned this pull request Jan 1, 2021
Merged
10 tasks
@ttuegel
Copy link
Member Author

ttuegel commented Jan 1, 2021

I didn't find any new failures in the dependent packages.

@ttuegel ttuegel merged commit 43939ba into NixOS:master Jan 1, 2021
@ttuegel ttuegel deleted the qt-5.12-darwin branch January 1, 2021 20:51
@SuperSandro2000
Copy link
Member

I will let you know if I see any other darwin related failures in qt.

ttuegel added a commit to ttuegel/nixpkgs that referenced this pull request Jan 1, 2021
@ttuegel
Merge pull request NixOS#108115 from ttuegel/qt-5.12-darwin
6914dc8 
qt512: fix darwin patches
(cherry picked from commit 43939ba)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prusnak prusnak prusnak approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: qt/kde 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ttuegel @r-burns @SuperSandro2000 @prusnak