continuation of #109595
pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.
python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
This upgrades pyqt5 and fixes the build. Note that the QtWebEngine
module is split into `pyqtwebengine` by upstream and us.
If your application gives an error that a Qt module is missing, then
that is most likely because it was not included when building pyqt5.
The solution is to simply add it here to the `(native)BuildInputs`.
Don't forget to add an import check. We should include all the modules
(except qtwebkit) that are needed.
Since about 5 hydra evaluations ago the build log has:
substituteStream(): WARNING: pattern 'install_dir=pydbusmoddir' doesn't match anything in file 'configure.py'
substituteStream(): WARNING: pattern 'ModuleMetadata(qmake_QT=['webkitwidgets'])' doesn't match anything in file 'configure.py'
Looking at the original configure.py I don't see any mention of
pydbusmoddir and ModuleMetadata seems to be set like the patch suggests:
'QtWebKitWidgets': ModuleMetadata(
qmake_QT=['webkitwidgets',
'printsupport']),
It appears that we don't need the fix anymore.
Reverts: d3ed0ab32b ('PyQt: fix build')
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
This is so that Qt user environment packages are also propagated. Fixes
Electrum environment installations when no other Qt applications are installed.
Added `dev` output so that closure size won't explode.
I don't know why the builder uses `lndir ${dbus-python} $out`,
but this commit should work around the problem caused by
dbus-python starting to propagate some inputs.
See #11567.
Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.
There is a small rebuild but I couldn't figure out the actual cause.
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of pyqt5 override
the whole configurePhase, so this hook isn't run at all.
This fixes the build of pyqt5 and it now successfully compiles on my
machine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
