Skip to content

Comments

qt6.wrapQtAppsHook: add qtbase and qtwayland to propagatedBuildInputs#269674

Closed
wineee wants to merge 18 commits intoNixOS:stagingfrom
wineee:qt6
Closed

qt6.wrapQtAppsHook: add qtbase and qtwayland to propagatedBuildInputs#269674
wineee wants to merge 18 commits intoNixOS:stagingfrom
wineee:qt6

Conversation

@wineee
Copy link
Member

@wineee wineee commented Nov 24, 2023

qtwayland client side is the wayland platform plugin, provides a way to run Qt applications as Wayland clients

without this, Qt applications only work on x11/xwayland

wrap-qt5-apps-hook has make qtwayland propaged

wrapQtAppsHook = callPackage ({ makeBinaryWrapper, qtbase, qtwayland }: makeSetupHook {
name = "wrap-qt5-apps-hook";
propagatedBuildInputs = [ qtbase.dev makeBinaryWrapper ]
++ lib.optional stdenv.isLinux qtwayland.dev;
} ../hooks/wrap-qt-apps-hook.sh) { };

Description of changes

cc @NixOS/qt-kde

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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.11 Release Notes (or backporting 23.05 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
  • Fits CONTRIBUTING.md.

Priorities

Add a 👍 reaction to pull requests you find important.

@wineee
Copy link
Member Author

wineee commented Nov 24, 2023

Maybe need more adjusted #264964

@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Nov 24, 2023
@wineee wineee marked this pull request as draft November 24, 2023 17:36
@NickCao
Copy link
Member

NickCao commented Nov 25, 2023

This was intentionally removed to reduce the closure size of cli only qt programs, but in the long run it looked like a bad idea. Maybe we can have a wrapQtClisHook for that particular usecase?

@puetzk
Copy link
Contributor

puetzk commented Dec 4, 2023

Hmm. If the push is closure size, CLI-only programs (QCoreApplication) shouldn't need xcb plugin either. So the real prize (in terms of shrinking closure) would be to split QtCore away from QtGui/QtWidgets in a muliple-output package, and send, and make QtGui the piece that carries all the QPA/QRhi plugins. Or there's the "the "plugins/platforms/libqminimal.so" qpa plugin for things that link to QtGui but don't actually display anything.

@Aleksanaa Aleksanaa mentioned this pull request Feb 8, 2024
13 tasks
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 8.has: clean-up This PR removes packages or removes other cruft and removed 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Mar 10, 2024
@wineee wineee changed the base branch from master to staging March 12, 2024 15:05
@github-actions github-actions bot added 6.topic: qt/kde Object-oriented framework for GUI creation 8.has: documentation This PR adds or changes documentation labels Mar 20, 2024
@wineee wineee marked this pull request as ready for review March 21, 2024 02:22
@wineee
Copy link
Member Author

wineee commented Mar 21, 2024

  1. Not tested on darwin (I don't have the device)
  2. Should move libs to depsTargetTargetPropagated(but the qt5 patch is still marked as draft, @Artturin Are there still obstacles to doing this?)
  3. qt5.wrapQtAppsHook always propagate qtwayland in linux,maybe we should add qt5.wrapQtClisHook

@wineee wineee requested review from Aleksanaa and K900 March 21, 2024 03:41
@ofborg ofborg bot requested a review from NickCao March 21, 2024 04:08
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. labels Mar 21, 2024
@Aleksanaa
Copy link
Member

3. qt5.wrapQtAppsHook always propagate qtwayland in linux,maybe we should add `qt5.wrapQtClisHook`

This should not matter, because it just happens that there is no qtwayland in qtbase, but logically there should be.

@K900
Copy link
Contributor

K900 commented Mar 21, 2024

I think we can leave Qt5 as is at this point, it'll just go away after a while. I'll look at the rest of the change in a bit.

@github-actions github-actions bot added 6.topic: flakes The experimental Nix feature 6.topic: lib The Nixpkgs function library 6.topic: php PHP is a general-purpose scripting language geared towards web development. labels Jun 11, 2024
@drupol drupol closed this Jun 11, 2024
@NixOS NixOS locked and limited conversation to collaborators Jun 11, 2024
@drupol
Copy link
Contributor

drupol commented Jun 11, 2024

It looks like you accidentally mass-pinged a bunch of people, which are now subscribed
and getting notifications for everything in this pull request. Unfortunately, they
cannot be automatically unsubscribed from the issue (removing review request does not
unsubscribe), therefore development cannot continue in this pull request anymore.

Please create a new pull request, link back to this one and ping the
people actually involved in here over there. For the next time, remember to set your PR to draft status before rebasing. In draft status, you can preview the list of maintainers that are about to be requested for review, which allows you to sidestep this issue.

In order to avoid this in the future, there are instructions for how to properly
rebase between branches in our contribution guidelines.
Setting your pull request to draft prior to rebasing is strongly recommended.
In draft status, you can preview the list of people that are about to be requested
for review, which allows you to sidestep this issue.
This is not a bulletproof method, though, as OfBorg still does review requests even on draft PRs.

@ofborg ofborg bot added 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. and removed 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jun 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

6.topic: flakes The experimental Nix feature 6.topic: lib The Nixpkgs function library 6.topic: php PHP is a general-purpose scripting language geared towards web development. 6.topic: qt/kde Object-oriented framework for GUI creation 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.