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

qt6, python3Packages.pyqt6: unbreak on darwin #204724

Merged
merged 5 commits into from
Jan 17, 2023
Merged

qt6, python3Packages.pyqt6: unbreak on darwin #204724

merged 5 commits into from
Jan 17, 2023

Conversation

wegank
Copy link
Member

@wegank wegank commented Dec 6, 2022 •
edited
Loading

Description of changes

The added qmake patch mimics this in Qt 5.

Closes #210905.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@wegank wegank marked this pull request as draft December 22, 2022 16:18
@wegank wegank marked this pull request as ready for review January 7, 2023 09:07
@wegank wegank mentioned this pull request Jan 7, 2023
Closed
@wegank wegank changed the title qt6Packages.qtpbfimageplugin: fix build on aarch64-darwin qt6: fix qmake on aarch64-darwin Jan 10, 2023
@ofborg ofborg bot requested review from LunNova, sikmir and NickCao January 10, 2023 14:31
@wegank
Copy link
Member Author

wegank commented Jan 10, 2023 •
edited
Loading

@ofborg build python3Packages.pyqt6

@wegank wegank changed the title qt6: fix qmake on aarch64-darwin qt6: fix qmake on darwin Jan 10, 2023
@wegank wegank changed the title qt6: fix qmake on darwin python3Packages.pyqt6: unbreak on darwin Jan 10, 2023
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/1685

NickCao
NickCao reviewed Jan 11, 2023
View reviewed changes
pkgs/development/libraries/qt-6/modules/qtbase.nix
Comment on lines -225 to -227
# build as a set of dynamic libraries
"-DFEATURE_framework=OFF"
Copy link
Member

Choose a reason for hiding this comment

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

What's the benefits/implications of building as frameworks?

Copy link
Member Author

Choose a reason for hiding this comment

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

qmake generates erroneous link args (e.g. -lQtNetwork.1) when not building as frameworks on darwin, so I don't have much choice...

pkgs/development/libraries/qt-6/modules/qtbase.nix Outdated Show resolved Hide resolved
NickCao
NickCao approved these changes Jan 11, 2023
View reviewed changes
Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

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

You may have to do a rebase if #210134 is merged first.

@ofborg ofborg bot requested a review from NickCao January 11, 2023 01:53
@LunNova
Copy link
Member

LunNova commented Jan 11, 2023

Result of nixpkgs-review pr 204724 run on x86_64-linux 1

1 package marked as broken and skipped:
  • obs-studio-plugins.obs-hyperion
93 packages built:
  • adwaita-qt6
  • beamerpresenter (beamerpresenter-mupdf)
  • beamerpresenter-poppler
  • calcmysky
  • calibre
  • cudaPackages.nsight_compute
  • cutemaze
  • duckstation
  • fcitx5-chinese-addons
  • fcitx5-configtool
  • fcitx5-unikey
  • fcitx5-with-addons
  • gpxsee (gpxsee-qt5)
  • gpxsee-qt6
  • gqrx
  • gqrx-gr-audio
  • gqrx-portaudio
  • jami-client
  • ladybird
  • libsForQt5.fcitx5-qt (plasma5Packages.fcitx5-qt)
  • libsForQt5.qtpbfimageplugin (plasma5Packages.qtpbfimageplugin)
  • maestral-gui
  • mediaelch-qt6
  • mozillavpn
  • obs-studio
  • obs-studio-plugins.droidcam-obs
  • obs-studio-plugins.input-overlay
  • obs-studio-plugins.looking-glass-obs
  • obs-studio-plugins.obs-gstreamer
  • obs-studio-plugins.obs-move-transition
  • obs-studio-plugins.obs-multi-rtmp
  • obs-studio-plugins.obs-nvfbc
  • obs-studio-plugins.obs-pipewire-audio-capture
  • obs-studio-plugins.obs-source-record
  • obs-studio-plugins.obs-vkcapture
  • obs-studio-plugins.wlrobs
  • pokefinder
  • prismlauncher
  • python310Packages.pyqt6
  • python310Packages.pyqt6-webengine
  • python39Packages.pyqt6
  • python39Packages.pyqt6-webengine
  • qMasterPassword
  • qalculate-qt
  • qgnomeplatform-qt6
  • qmmp
  • qt6.full (qt6Packages.full)
  • qt6.qmake (qt6Packages.qmake)
  • qt6.qt3d (qt6Packages.qt3d)
  • qt6.qt5compat (qt6Packages.qt5compat)
  • qt6.qtbase (qt6Packages.qtbase)
  • qt6.qtcharts (qt6Packages.qtcharts)
  • qt6.qtconnectivity (qt6Packages.qtconnectivity)
  • qt6.qtdatavis3d (qt6Packages.qtdatavis3d)
  • qt6.qtdeclarative (qt6Packages.qtdeclarative)
  • qt6.qtdoc (qt6Packages.qtdoc)
  • qt6.qthttpserver (qt6Packages.qthttpserver)
  • qt6.qtimageformats (qt6Packages.qtimageformats)
  • qt6.qtlanguageserver (qt6Packages.qtlanguageserver)
  • qt6.qtlottie (qt6Packages.qtlottie)
  • qt6.qtmultimedia (qt6Packages.qtmultimedia)
  • qt6.qtnetworkauth (qt6Packages.qtnetworkauth)
  • qt6.qtpositioning (qt6Packages.qtpositioning)
  • qt6.qtquick3d (qt6Packages.qtquick3d)
  • qt6.qtquick3dphysics (qt6Packages.qtquick3dphysics)
  • qt6.qtquicktimeline (qt6Packages.qtquicktimeline)
  • qt6.qtremoteobjects (qt6Packages.qtremoteobjects)
  • qt6.qtscxml (qt6Packages.qtscxml)
  • qt6.qtsensors (qt6Packages.qtsensors)
  • qt6.qtserialbus (qt6Packages.qtserialbus)
  • qt6.qtserialport (qt6Packages.qtserialport)
  • qt6.qtshadertools (qt6Packages.qtshadertools)
  • qt6.qtspeech (qt6Packages.qtspeech)
  • qt6.qtsvg (qt6Packages.qtsvg)
  • qt6.qttools (qt6Packages.qttools)
  • qt6.qttranslations (qt6Packages.qttranslations)
  • qt6.qtvirtualkeyboard (qt6Packages.qtvirtualkeyboard)
  • qt6.qtwayland (qt6Packages.qtwayland)
  • qt6.qtwebchannel (qt6Packages.qtwebchannel)
  • qt6.qtwebengine (qt6Packages.qtwebengine)
  • qt6.qtwebsockets (qt6Packages.qtwebsockets)
  • qt6.qtwebview (qt6Packages.qtwebview)
  • qt6Packages.kcoreaddons
  • qt6Packages.poppler
  • qt6Packages.qtpbfimageplugin
  • qt6Packages.quazip
  • qt6Packages.qxlsx
  • qutebrowser-qt6
  • retext
  • stellarium
  • tdesktop
  • zeal-qt6
  • zint

@lilyinstarlight
Copy link
Member

Ah, I hadn't seen this PR before I made #210134 and I targeted that to staging before I realized the qt6-only rebuilds aren't actually that many (and it has already been merged to staging)

Given this PR has conflicts with that one, but is targeted to a different branch, would it be easier to just retarget this to staging and fix the merge conflict, or is there a fancier method to fix the merge conflict in advance for the different branches?

@NickCao
Copy link
Member

NickCao commented Jan 15, 2023

Ah I didn't see that was targeting staging. No need to worry about that, the conflict is minor and can be easily resolved later.

@NickCao
Copy link
Member

NickCao commented Jan 15, 2023

@orborg build python3Packages.pyqt6

@wegank
Copy link
Member Author

wegank commented Jan 15, 2023 •
edited
Loading

Oh no, there are regressions from #192057 and #208440 that prevent building qtbase on darwin...

@wegank
Copy link
Member Author

wegank commented Jan 15, 2023 •
edited
Loading

OK, both Qt 6 and PyQt6 are back on my aarch64-darwin machine. I guess I have to go to sleep...

@wegank wegank changed the title python3Packages.pyqt6: unbreak on darwin qt6, python3Packages.pyqt6: unbreak on darwin Jan 15, 2023
@wegank wegank changed the title qt6, python3Packages.pyqt6: unbreak on darwin python3Packages.pyqt6: unbreak on darwin Jan 15, 2023
@wegank wegank marked this pull request as draft January 15, 2023 02:35
@wegank wegank marked this pull request as ready for review January 15, 2023 02:38
@wegank wegank changed the title python3Packages.pyqt6: unbreak on darwin qt6, python3Packages.pyqt6: unbreak on darwin Jan 15, 2023
@ofborg ofborg bot requested a review from LunNova January 15, 2023 02:53
@NickCao
Copy link
Member

NickCao commented Jan 16, 2023

Apart from the libepoxy regression on x86_64-darwin, this looks good to go.

@wegank
Copy link
Member Author

wegank commented Jan 17, 2023 •
edited
Loading

@ofborg build python3Packages.pyqt6

@wegank
Copy link
Member Author

wegank commented Jan 17, 2023

@ofborg build qt6.qtbase qt6.qtbase.passthru.tests

@wegank
Copy link
Member Author

wegank commented Jan 17, 2023

@NickCao I would like to know if you could merge the PR...

@NickCao NickCao merged commit 9f3998d into NixOS:master Jan 17, 2023
@wegank wegank deleted the qtpbfimageplugin branch January 17, 2023 23:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@sikmir sikmir Awaiting requested review from sikmir

@NickCao NickCao Awaiting requested review from NickCao

@LunNova LunNova Awaiting requested review from LunNova

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

Successfully merging this pull request may close these issues.

qt6: broken on darwin
5 participants
@wegank @nixos-discourse @LunNova @lilyinstarlight @NickCao