qt6: add darwin support #202015

wegank · 2022-11-20T06:17:04Z

Description of changes

#188938

Things done

NickCao

diff LGTM

NickCao · 2022-11-20T08:03:25Z

Actually this could have just targeted master, the amount of rebuild is relatively small.
cc @jiegec for testing.

jiegec · 2022-11-20T12:01:10Z

nixpkgs-review on aarch64-darwin:

2 packages failed to build:
calcmysky qt6Packages.qxlsx

6 packages built:
qt6.qmake qt6.qtbase qt6Packages.poppler unixODBCDrivers.mariadb unixODBCDrivers.psql unixODBCDrivers.sqlite

NickCao · 2022-11-20T12:03:31Z

@wegank would you mind at least fixing the build of qxlsx to ensure that qtbase actually works?

pkgs/development/libraries/qt-6/default.nix

pkgs/development/libraries/qt-6/modules/qtbase.nix

jiegec · 2022-11-20T12:16:34Z

qt6Packages.qxlsx can build if adding OpenGL framework to buildInputs.

wegank · 2022-11-20T14:14:37Z

Rebased to master and fixed both calcmysky and qt6Packages.qxlsx.

pkgs/applications/science/astronomy/calcmysky/default.nix

jiegec · 2022-11-20T14:38:09Z

Result of nixpkgs-review pr 202015 run on aarch64-darwin 1

8 packages built:

calcmysky
qt6.qmake
qt6.qtbase
qt6Packages.poppler
qt6Packages.qxlsx
unixODBCDrivers.mariadb
unixODBCDrivers.psql
unixODBCDrivers.sqlite

risicle · 2022-11-20T18:08:29Z

Only failure nixpkgs-review reveals for me on macos 10.15 is ladybird, but it obviously isn't a new failure. Still builds for me fine, nixos x86_64.

LunNova · 2022-11-27T19:43:11Z

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

3 packages marked as broken and skipped:

libsForQt512.fcitx5-qt
libsForQt514.fcitx5-qt
obs-studio-plugins.obs-hyperion

86 packages built:

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
jami-client-qt
ladybird
libsForQt5.fcitx5-qt (libsForQt515.fcitx5-qt ,plasma5Packages.fcitx5-qt)
libsForQt5.qtpbfimageplugin (libsForQt515.qtpbfimageplugin ,plasma5Packages.qtpbfimageplugin)
libsForQt512.qtpbfimageplugin
libsForQt514.qtpbfimageplugin
maestral-gui
mozillavpn
obs-studio
obs-studio-plugins.input-overlay
obs-studio-plugins.looking-glass-obs
obs-studio-plugins.obs-backgroundremoval
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
prismlauncher
python310Packages.pyqt6
python310Packages.pyqt6-webengine
python39Packages.pyqt6
python39Packages.pyqt6-webengine
qMasterPassword
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
stellarium
tdesktop
unixODBCDrivers.mariadb
zeal-qt6
zint

LunNova · 2022-11-27T20:05:56Z

Looks good! Tried out Calibre too which depends on QtWebEngine which is a fairly good manual test.

nixos-discourse · 2022-11-28T15:23:04Z

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

https://discourse.nixos.org/t/prs-already-reviewed/2617/691

pkgs/applications/networking/browsers/ladybird/default.nix

SuperSandro2000 · 2022-11-28T22:36:35Z

pkgs/development/libraries/qt-6/default.nix

@@ -90,7 +98,9 @@ let
      qt3d = callPackage ./modules/qt3d.nix { };
      qt5compat = callPackage ./modules/qt5compat.nix { };
      qtcharts = callPackage ./modules/qtcharts.nix { };
-      qtconnectivity = callPackage ./modules/qtconnectivity.nix { };
+      qtconnectivity = callPackage ./modules/qtconnectivity.nix {


You must use the callPackage wrapper or integrate it into qt's callPackage wrapper.

It actually uses the same callPackage wrapper as in qtbase.

pkgs/development/libraries/qt-6/modules/qtbase.nix

pkgs/development/libraries/qt-6/modules/qtconnectivity.nix

SuperSandro2000 · 2022-11-28T22:39:12Z

pkgs/development/libraries/qtpbfimageplugin/default.nix

      --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib'
  '';

+  qmakeFlags = lib.optionals stdenv.isDarwin [
+    "CONFIG+=c++17"
+    "QMAKE_MACOSX_DEPLOYMENT_TARGET=10.15"


Should we get this from the sdk version?

I don't think so, it's just to avoid an error (in the comment) mentioning macOS 10.15. Also, this package seems to rely on Xcode Command Line Tools. Should we mark this as broken for now?

If it doesn't work sure. We can always revisit it. Also this keeps the scope of this PR manageable.

pkgs/development/python-modules/pyqt/6.x.nix

pkgs/top-level/all-packages.nix

nixos-discourse · 2022-12-05T02:21:57Z

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

https://discourse.nixos.org/t/prs-already-reviewed/2617/708

Atemu

Diff LGTM.

ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 20, 2022

wegank force-pushed the qt6-qtbase-darwin branch 3 times, most recently from 4e1bfa4 to a7bae16 Compare November 20, 2022 06:55

ofborg bot added the 8.has: package (new) This PR adds a new package label Nov 20, 2022

ofborg bot requested review from NickCao and LunNova November 20, 2022 07:55

ofborg bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500 labels Nov 20, 2022

NickCao approved these changes Nov 20, 2022

View reviewed changes

ofborg bot requested a review from NickCao November 20, 2022 08:08

Atemu requested changes Nov 20, 2022

View reviewed changes

pkgs/development/libraries/qt-6/default.nix Outdated Show resolved Hide resolved

pkgs/development/libraries/qt-6/modules/qtbase.nix Outdated Show resolved Hide resolved

wegank marked this pull request as draft November 20, 2022 14:13

wegank force-pushed the qt6-qtbase-darwin branch from a7bae16 to 5ecb508 Compare November 20, 2022 14:13

wegank changed the base branch from staging to master November 20, 2022 14:13

wegank marked this pull request as ready for review November 20, 2022 14:13

NickCao reviewed Nov 20, 2022

View reviewed changes

pkgs/applications/science/astronomy/calcmysky/default.nix Outdated Show resolved Hide resolved

ofborg bot added the 8.has: clean-up label Nov 20, 2022

ofborg bot requested a review from NickCao November 20, 2022 14:24

wegank force-pushed the qt6-qtbase-darwin branch from 5ecb508 to 91db85f Compare November 20, 2022 15:15

wegank changed the title ~~qt6.qtbase: add aarch64-darwin support~~ qt6.qtbase: add darwin support Nov 20, 2022

wegank force-pushed the qt6-qtbase-darwin branch from 91db85f to 33bc099 Compare November 20, 2022 15:18

wegank requested a review from Atemu November 20, 2022 15:35

wegank mentioned this pull request Nov 27, 2022

qt6.qtwebengine: add aarch64-darwin support #203310

Merged

13 tasks

LunNova approved these changes Nov 27, 2022

View reviewed changes

SuperSandro2000 reviewed Nov 28, 2022

View reviewed changes

wegank added 8 commits November 28, 2022 23:51

qt6.qtconnectivity: fix build on aarch64-darwin

1b23119

qt6.qtmultimedia: unbreak on aarch64-darwin

8091739

qt6.qtserialport: unbreak on aarch64-darwin

2e7f0a8

qt6.qtspeech: unbreak on aarch64-darwin

65a2669

qt6.qttools: fix build on aarch64-darwin

dfb9d03

qt6.qtwebview: add aarch64-darwin support

df46edf

qt6.qtbase: fix build on x86_64-darwin

c44dd89

qt6.qtquick3dphysics: fix build on x86_64-darwin

5821ec2

wegank mentioned this pull request Nov 28, 2022

ladybird: fix build #203532

Merged

13 tasks

wegank force-pushed the qt6-qtbase-darwin branch 3 times, most recently from a036c58 to a44cd98 Compare November 28, 2022 23:33

wegank added 2 commits November 29, 2022 00:41

python3Packages.pyqt6: mark as broken on darwin

743fdc3

qt6.qtbase: add aarch64-darwin support

c0d8c84

ofborg bot requested a review from LunNova November 28, 2022 23:44

qt6Packages.qtpbfimageplugin: fix build on aarch64-darwin

44b66a3

wegank force-pushed the qt6-qtbase-darwin branch from a44cd98 to 44b66a3 Compare November 29, 2022 00:10

SuperSandro2000 approved these changes Nov 29, 2022

View reviewed changes

mweinelt added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Dec 3, 2022

Atemu approved these changes Dec 5, 2022

View reviewed changes

SuperSandro2000 merged commit 1749190 into NixOS:master Dec 5, 2022

wegank deleted the qt6-qtbase-darwin branch December 5, 2022 13:21

boeyms mentioned this pull request Jan 7, 2023

qt6: darwin / macOS support #188938

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

qt6: add darwin support #202015

qt6: add darwin support #202015

wegank commented Nov 20, 2022 •

edited

Loading

NickCao left a comment

NickCao commented Nov 20, 2022

jiegec commented Nov 20, 2022

NickCao commented Nov 20, 2022

jiegec commented Nov 20, 2022

wegank commented Nov 20, 2022

jiegec commented Nov 20, 2022

risicle commented Nov 20, 2022

LunNova commented Nov 27, 2022

LunNova commented Nov 27, 2022

nixos-discourse commented Nov 28, 2022

SuperSandro2000 Nov 28, 2022

wegank Nov 29, 2022

SuperSandro2000 Nov 28, 2022

wegank Nov 29, 2022

SuperSandro2000 Nov 29, 2022

nixos-discourse commented Dec 5, 2022

Atemu left a comment

qt6: add darwin support #202015

qt6: add darwin support #202015

Conversation

wegank commented Nov 20, 2022 • edited Loading

Description of changes

Things done

NickCao left a comment

Choose a reason for hiding this comment

NickCao commented Nov 20, 2022

jiegec commented Nov 20, 2022

NickCao commented Nov 20, 2022

jiegec commented Nov 20, 2022

wegank commented Nov 20, 2022

jiegec commented Nov 20, 2022

risicle commented Nov 20, 2022

LunNova commented Nov 27, 2022

LunNova commented Nov 27, 2022

nixos-discourse commented Nov 28, 2022

SuperSandro2000 Nov 28, 2022

Choose a reason for hiding this comment

wegank Nov 29, 2022

Choose a reason for hiding this comment

SuperSandro2000 Nov 28, 2022

Choose a reason for hiding this comment

wegank Nov 29, 2022

Choose a reason for hiding this comment

SuperSandro2000 Nov 29, 2022

Choose a reason for hiding this comment

nixos-discourse commented Dec 5, 2022

Atemu left a comment

Choose a reason for hiding this comment

wegank commented Nov 20, 2022 •

edited

Loading