Unbreak qt5.full, add qt3d, qtgamepad, qtremoteobjects#102490
Unbreak qt5.full, add qt3d, qtgamepad, qtremoteobjects#102490Lucus16 wants to merge 4 commits intoNixOS:masterfrom
Conversation
There was a problem hiding this comment.
I don't understand what you mean.
There was a problem hiding this comment.
ofborg fails to eval everything and until that I can't run nixpkgs-review.
bb640fe to
7d8ad16
Compare
pkgs/top-level/python-packages.nix
Outdated
|
@Lucus16 some of the changes here look good. They would be worth putting in a separate PR or PRs, as now qt515.qtwebkit builds and works and the new qt modules added don't relate to qtwebkit for as far as I understand. |
|
@Lucus16 Please resolve the merge conflict. |
For some qt modules, the default output is bin while the shared objects are still in out. This makes sure all shared objects show up in the qt5.full env. Maybe the default output should always be out instead?
These packages don't seem to need qtwebkit anymore: k3b kreport rocs
|
Rebased. I don't have access to a build machine right now so I haven't tested. |
doronbehar
left a comment
There was a problem hiding this comment.
Just a few nits about the commit log and not the changes themselves. Otherwise looks great to me.
| qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects | ||
| qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 | ||
| qtscript qtsensors qtserialport qtsvg qttools qttranslations | ||
| qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets | ||
| qtwebview qtx11extras qtxmlpatterns | ||
| qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad | ||
| qtgraphicaleffects qtimageformats qtlocation qtmultimedia | ||
| qtquickcontrols qtquickcontrols2 qtremoteobjects qtscript qtsensors | ||
| qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel | ||
| qtwebengine qtwebkit qtwebsockets qtwebview qtx11extras qtxmlpatterns |
There was a problem hiding this comment.
Nit: It'd be nice if the diff was cleaner and would only include the added modules.
| mkDerivation, lib, | ||
| extra-cmake-modules, boost, | ||
| qtbase, qtscript, qtquickcontrols, qtwebkit, qtxmlpatterns, grantlee, | ||
| qtbase, qtscript, qtquickcontrols, qtxmlpatterns, grantlee, |
There was a problem hiding this comment.
Nit: The changes in kdeApplications: remove qtwebkit dependency IMO should be split to 3 - each change for each package.
| kwindowsystem, kxmlgui, sonnet, threadweaver, | ||
| kcontacts, akonadi, akonadi-calendar, akonadi-contacts, | ||
| eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen, | ||
| librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon, |
There was a problem hiding this comment.
Another nit: The commit for calligra should explain that openjpeg is used / not used / isn't mandatory for it's build? And that the latest poppler can be used and poppler_0_61 is not needed.
|
I marked this as stale due to inactivity. → More info |
|
Closing due to inactivity from author. |
Motivation for this change
qtwebkitwas already marked broken for qt 5.15 and the last commit I found is more than a year old so it is unlikely to be fixed. It brokeqt5.fullby being a part of it so I removed it.For some qt modules, the default output is
binwhile the shared objects are still inout. I addedoutto the used outputs of theqt5.fullenvironment so all shared objects are included. Maybe the default output of the qt modules should always be out instead?Added more qt modules: qt3d, qtgamepad, qtremoteobjects
I tested the changes by building
qt5{12,14,15}.fulland running an application that depends on the added qt modules.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)