Commit Graph

118 Commits

Author SHA1 Message Date
Nick Cao
0bad2288a7
qt6.qttools: symlink bin to dev output
There are several reference to "${qttools.dev}/bin" treewide, adding the
symlink to fix compatibility with these packages.
2023-04-14 19:30:01 +08:00
Nick Cao
e5ba8e7113
qt6.qttools: fix embedded path to tools 2023-04-14 19:30:01 +08:00
Nick Cao
37e3fafb41
qt6.qtdeclarative: drop outdated workarounds 2023-04-14 19:30:00 +08:00
Nick Cao
91fb53dce3
qt6.qtwebengine: remove outdated postFixup phase 2023-04-14 19:29:59 +08:00
Nick Cao
d25348517e
qt6.qtbase: fixup paths in setup hooks 2023-04-14 19:29:58 +08:00
Nick Cao
bf05505377
qt6.qtbase: remove fixQmakeLibtool hook
As we are now building qt modules with cmake, libtool libraries are no
longer generated, the fixQmakeLibtool hook can be droppped.
2023-04-14 19:29:57 +08:00
Nick Cao
f9f2b3ae42
qt6: fix references to qmake
As devTools are no longer moved to the dev output,
paths to qmake has to be updated.
2023-04-14 19:09:57 +08:00
Nick Cao
d84e2bf056
qt6: do not move devTools to dev output 2023-04-14 19:09:56 +08:00
Nick Cao
5aa78f89f0
qt6.qtbase: refresh patches
Apart from the previous ones, two new patches are added. One for
reducing the runtime closure size by removing reference to cmake, the
other for fixing the linker flags in generated qmake files.
2023-04-14 19:09:55 +08:00
Nick Cao
d94ae302c6
qt6.qtbase: do not embed compiler information into generated cmake files
The qt build system embeds information about compilers used during
building qtbase into the generated cmake files, to avoid mixing
different compilers when building qt modules, however this greatly
bloats the closure size of qtbase and the mixed use of compilers is
sometimes desired in Nixpkgs.
2023-04-14 18:38:03 +08:00
Nick Cao
97a538791c
qt6: set "moveToDev" to false
The qt build system locates header files, libraries and other installed
components with paths relative to the cmake files. Thus the default
behavior of moving them to the "dev" output breaks these expectations
and is now disabled.
2023-04-14 18:34:21 +08:00
Nick Cao
21a773c671
qt6: drop cmake patch used for fixing cmake file generation
The "multiple-outputs.sh" setup hook moves "include", "lib/cmake" and
other folders into the "dev" output if it exists, thus breaking the
invariants expected by the qt build system and we used to patch cmake to
fixup the generated cmake files. In a series of changes to rework qt
packaging, we are now setting "moveToDev" to false to suppress that
behavior, and the cmake patch is no longer required.
2023-04-14 18:34:07 +08:00
Weijia Wang
1bf4cbfa5e qt6.qtconnectivity: fix build on darwin 2023-04-13 22:59:13 +03:00
Nick Cao
1cf3cca8c0
qt6: move all qmake related files to dev output 2023-04-11 15:40:56 +08:00
Nick Cao
bf30644a3d
qt6.qtModule: drop fixup handlings
As they are either already part of the qtbase setupHook,
or no longer required as we are building qt components with cmake.
2023-04-11 15:40:56 +08:00
Nick Cao
528dd7fa25
Merge pull request #225555 from NickCao/qt6-cleanup
qt6: general cleanup to ease future reworking of packaging
2023-04-11 07:39:53 +08:00
Nick Cao
c14e333ec0
qt6.qtModule: removed unnecessary callPackage arguments 2023-04-10 18:00:35 +08:00
Nick Cao
5d13961fd6
qt6: format pkgs/development/libraries/qt-6/default.nix 2023-04-10 17:58:02 +08:00
Nick Cao
8a159fe975
qt6.qtbase: removed unnecessary callPackage arguments 2023-04-10 17:56:35 +08:00
Nick Cao
12cfa69c8e
qt6: move stdenv and cmake override to within pkgs/development/libraries/qt-6 2023-04-10 17:53:56 +08:00
Nick Cao
845e491205
qt6.qtModules: use callPackage 2023-04-10 17:50:44 +08:00
Nick Cao
9604890e72
qt6: use callPackage in all-packages.nix 2023-04-10 17:42:36 +08:00
Nick Cao
e50871163f
Merge pull request #202223 from alois31/qmlls
qt6.qtdeclarative: build qmlls
2023-04-09 00:22:53 +08:00
Nick Cao
9a646316b1
qt6.qtwebengine: pin to ffmpeg_4
As Unmodified ffmpeg >= 5.0 is not supported by upstream
2023-03-25 10:16:43 +08:00
github-actions[bot]
705ac3185e
Merge master into staging-next 2023-03-23 06:01:22 +00:00
Nick Cao
25c1820914
qt6.qtbase: add patch to fix handling of variable fonts 2023-03-22 16:26:29 +08:00
github-actions[bot]
36748936f9
Merge master into staging-next 2023-03-18 06:01:16 +00:00
Nick Cao
c45c560fa0
qt6: 6.4.2 -> 6.4.3 2023-03-16 20:59:44 +08:00
Sergei Trofimovich
69cf5181c3 stdenv/generic/setup.sh: enable parallel installs by default
The primary motivating example is openssl:

Before the change full package build took 1m54s minutes.
After the change full package build takes 59s.

About a 2x speedup.

The difference is visible because openssl builds hundreds of manpages
spawning a perl process per manual in `install` phase. Such a workload
is very easy to parallelize.

Another example would be `autotools`+`libtool` based build system where
install step requires relinking. The more binaries there are to relink
the more gain it will be to do it in parallel.

The change enables parallel installs by default only for buiilds that
already have parallel builds enabled. There is a high chance those build
systems already handle parallelism well but some packages will fail.

Consistently propagated the enableParallelBuilding to:
- cmake (enabled by default, similar to builds)
- ninja (set parallelism explicitly, don't rely on default)
- bmake (enable when requested)
- scons (enable when requested)
- meson (set parallelism explicitly, don't rely on default)
- waf (set parallelism explicitly, don't rely on default)
- qmake-4/5/6 (enable by default, similar to builds)
- xorg (always enable, similar to builds)
2023-02-26 22:02:09 +00:00
Alyssa Ross
52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Artturin
6f6cc4a22d treewide: use toString on list NIX_CFLAGS_COMPILE
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
2023-02-22 21:23:04 +02:00
Artturin
4e3dcf364e treewide: makeSetupHook deps -> propagatedBuildInputs 2023-02-07 21:02:00 +02:00
Weijia Wang
cd10a33b63 qt6.qtbase: fix regression 2023-02-06 18:07:39 +01:00
Nick Cao
d5184e093d
Merge pull request #213640 from raphaelr/qt6-dont-retain-cmake
qt6.qtbase: don't retain cmake as a runtime dependency
2023-02-02 09:28:23 +08:00
Raphael Robatsch
a0d3c92c19 qt6.qtbase: don't retain cmake as a runtime dependency 2023-01-30 21:40:59 +01:00
Vladimír Čunát
c54cb21217
qt6.qtbase: fix broken conditional for build inputs
This was broken by automatic merge 9e72ff5c31 I think?
2023-01-30 10:33:32 +01:00
Sergei Trofimovich
b9b1d958d0 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/libraries/qt-6/modules/qtbase.nix
	pkgs/stdenv/linux/make-bootstrap-tools.nix
2023-01-20 21:56:57 +00:00
Alyssa Ross
0ae87d514f treewide: add names to all setup hooks 2023-01-19 15:00:36 +00:00
Nick Cao
9f3998d62f
Merge pull request #204724 from wegank/qtpbfimageplugin
qt6, python3Packages.pyqt6: unbreak on darwin
2023-01-18 07:36:26 +08:00
github-actions[bot]
76839f69b4
Merge staging-next into staging 2023-01-16 06:01:40 +00:00
Nick Cao
78a377ed28
Merge pull request #210290 from NickCao/qt642
qt6: 6.4.1 -> 6.4.2
2023-01-16 10:52:28 +08:00
Weijia Wang
54452b041d qt6.qtbase: detect if file exists 2023-01-15 03:38:03 +01:00
Weijia Wang
100cf5700d qt6.qtbase: enable sandbox builds 2023-01-15 03:23:11 +01:00
Weijia Wang
2de4b6139e qt6.qtbase: enable framework builds 2023-01-15 03:20:38 +01:00
Weijia Wang
95df79b063 qt6.qtbase: disable cxx17 features on darwin 2023-01-15 03:19:09 +01:00
github-actions[bot]
9e72ff5c31
Merge staging-next into staging 2023-01-13 00:02:48 +00:00
Nick Cao
86f80c8f1b
Merge pull request #208440 from NickCao/qt6-closure
Reduce the closure size of various qt6 packages
2023-01-13 06:43:19 +08:00
Nick Cao
dffa549063
qt6: 6.4.1 -> 6.4.2 2023-01-12 10:08:21 +08:00
Adam Joseph
250e410a92
qt-6/modules/qtbase: add systemdSupport parameter (#192057) 2023-01-12 01:06:36 +02:00