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.

Sign up for GitHub

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

qt511.qtbase: fix darwin build #43290

Merged
merged 1 commit into from Jul 10, 2018
Merged

qt511.qtbase: fix darwin build #43290

merged 1 commit into from Jul 10, 2018

Conversation

orivej
Copy link
Contributor

@orivej orivej commented Jul 10, 2018

Motivation for this change

Qt 5.11.1 replaced one occurrence of NSMouseMoved with NSEventTypeMouseMoved:
qt/qtbase@da32360.

It is not available in AppKit from macOS 10.10, therefore this change restores
NSMouseMoved: https://developer.apple.com/documentation/appkit/nsmousemoved

Closes #43258

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@orivej
qt511.qtbase: fix darwin build
bbca504 
Qt 5.11.1 replaced one occurrence of NSMouseMoved with NSEventTypeMouseMoved:
qt/qtbase@da32360.

It is not available in AppKit from macOS 10.10, therefore this change restores
NSMouseMoved: https://developer.apple.com/documentation/appkit/nsmousemoved

Closes NixOS#43258
@orivej orivej requested a review from ttuegel as a code owner July 10, 2018 15:29
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Jul 10, 2018
@orivej orivej mentioned this pull request Jul 10, 2018
Closed
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: qt511.qtbase

Partial log (click to expand)


  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0 8063k    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100 8063k  100 8063k    0     0  8063k      0  0:00:01 --:--:--  0:00:01 8736k

fetching path ‘/nix/store/r3a0cky3iv24i6x3w9if3l3zgkd0k8cz-qtbase-5.11.1-bin’...

*** Downloading ‘https://nix-cache.s3.amazonaws.com/nar/0q7qzjqzzybvryzl649rmvjv9klmw0ndscyz22ndz1670br6dn3m.nar.xz’ (signed by ‘cache.nixos.org-1’) to ‘/nix/store/r3a0cky3iv24i6x3w9if3l3zgkd0k8cz-qtbase-5.11.1-bin’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100  578k  100  578k    0     0   578k      0  0:00:01 --:--:--  0:00:01 3343k

/nix/store/r3a0cky3iv24i6x3w9if3l3zgkd0k8cz-qtbase-5.11.1-bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: qt511.qtbase

Partial log (click to expand)

copying path '/nix/store/kg1kba3r1vgqabr7gwkvihwdnd7hf5v6-icu4c-59.1' from 'https://cache.nixos.org'...
copying path '/nix/store/imy3q141dzn7chvgbmybvm2qzrhxh7jv-libevdev-1.5.9' from 'https://cache.nixos.org'...
copying path '/nix/store/mxh3awklcp019n6qb4ysp9wc2pkap6hl-libossp-uuid-1.6.2' from 'https://cache.nixos.org'...
copying path '/nix/store/iax4dnwb8489vcbfdcgfmf1pgap82234-libwacom-0.29' from 'https://cache.nixos.org'...
copying path '/nix/store/bf5al9cr6q29i924r611lrsvrhdm1pgl-mtdev-1.1.5' from 'https://cache.nixos.org'...
copying path '/nix/store/fy40mipzkak96azgjm9x26445xfivbir-postgresql-9.6.8-lib' from 'https://cache.nixos.org'...
copying path '/nix/store/pf7lba6b8c2qqp18ny0aa452n0vqan5a-libinput-1.11.0' from 'https://cache.nixos.org'...
copying path '/nix/store/a9qclp5qgnkfw34viqjb5cs762kgmppc-qtbase-5.11.1' from 'https://cache.nixos.org'...
copying path '/nix/store/rqc0x9hj8jpcwziyz25rf3x007vk9crj-qtbase-5.11.1-bin' from 'https://cache.nixos.org'...
/nix/store/rqc0x9hj8jpcwziyz25rf3x007vk9crj-qtbase-5.11.1-bin

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: qt511.qtbase

Partial log (click to expand)

Removing empty /nix/store/1rp51m0razh8mi180g9zr2xygfwkgsr6-qtbase-5.11.1/bin/ and (possibly) its parents
Moving /nix/store/sl2gib0qg5d9gajmv277ybwr9jywa5d6-qtbase-5.11.1-bin/bin/uic to /nix/store/fp17bwd9bq1bx6z6w24zxcmsqrn5gz3l-qtbase-5.11.1-dev/bin/uic
rmdir: failed to remove '/nix/store/sl2gib0qg5d9gajmv277ybwr9jywa5d6-qtbase-5.11.1-bin/bin': Directory not empty
updateToolPath: Updating `/nix/store/sl2gib0qg5d9gajmv277ybwr9jywa5d6-qtbase-5.11.1-bin/bin/moc' in `/nix/store/fp17bwd9bq1bx6z6w24zxcmsqrn5gz3l-qtbase-5.11.1-dev/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake\'...
updateToolPath: Updating `/nix/store/sl2gib0qg5d9gajmv277ybwr9jywa5d6-qtbase-5.11.1-bin/bin/qmake' in `/nix/store/fp17bwd9bq1bx6z6w24zxcmsqrn5gz3l-qtbase-5.11.1-dev/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake\'...
updateToolPath: Updating `/nix/store/sl2gib0qg5d9gajmv277ybwr9jywa5d6-qtbase-5.11.1-bin/bin/rcc' in `/nix/store/fp17bwd9bq1bx6z6w24zxcmsqrn5gz3l-qtbase-5.11.1-dev/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake\'...
updateToolPath: Updating `/nix/store/sl2gib0qg5d9gajmv277ybwr9jywa5d6-qtbase-5.11.1-bin/bin/uic' in `/nix/store/fp17bwd9bq1bx6z6w24zxcmsqrn5gz3l-qtbase-5.11.1-dev/lib/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake\'...
Moving /nix/store/sl2gib0qg5d9gajmv277ybwr9jywa5d6-qtbase-5.11.1-bin/bin to /nix/store/fp17bwd9bq1bx6z6w24zxcmsqrn5gz3l-qtbase-5.11.1-dev/bin
rmdir: failed to remove '/nix/store/sl2gib0qg5d9gajmv277ybwr9jywa5d6-qtbase-5.11.1-bin': Directory not empty
/nix/store/sl2gib0qg5d9gajmv277ybwr9jywa5d6-qtbase-5.11.1-bin

@LnL7
Copy link
Member

LnL7 commented Jul 10, 2018

Oh boy, this is really getting out of hand now.

LnL7
LnL7 approved these changes Jul 10, 2018
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Thanks!

@LnL7 LnL7 merged commit 46cbd44 into NixOS:master Jul 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 approved these changes

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: qt/kde 10.rebuild-darwin: 101-500 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@orivej @GrahamcOfBorg @LnL7