Commit Graph

961 Commits

Author SHA1 Message Date
Christoph Neidahl
bfc75c7491
libsForQt5.qtsystems: init at unstable-2019-01-03 (#214179) 2023-04-15 00:42:03 +02:00
Weijia Wang
02c564de3c qt5.qtwebengine: fix build on aarch64-darwin 2023-04-12 20:03:30 +03:00
K900
da5f04dd9e qt5/qtwayland: drop merged patch 2023-04-05 12:38:45 +03:00
K900
76973ae3b3 qt5: regularly scheduled patchset update 2023-04-03 20:55:53 +03:00
Vladimír Čunát
3ffdc0b033
Merge #220311: qt-5/hooks: do not hardcode output paths
...into staging
2023-03-25 17:35:13 +01:00
Vladimír Čunát
a53bfc01dc
Merge #219427: qt5: make overrriding with separate debug info useful
...into staging
2023-03-25 13:27:33 +01:00
github-actions[bot]
cead7e3e73
Merge master into staging-next 2023-03-25 00:02:20 +00:00
Jan Tojnar
7c4188ac9a qt5.overrideScope': only add when allowAliases is enabled
Otherwise it will spam pkgs traversal (e.g. update.nix).

Introduced in 2cbbef006b
2023-03-24 19:13:48 +01:00
Guillaume Girol
b237f5b637 qt5: make overriding separatedebuginfo useful
qmake strips before we separate the debuginfo
2023-03-19 12:00:00 +00:00
github-actions[bot]
403b148aa5
Merge master into staging-next 2023-03-18 18:01:02 +00:00
Weijia Wang
de7f43e787
Merge pull request #220893 from mrene/fix-sdrangel-darwin
sdrangel: fix darwin build
2023-03-18 19:26:49 +02:00
github-actions[bot]
a912b83051
Merge master into staging-next 2023-03-18 12:01:30 +00:00
K900
a5a292c7a8 treewide: clear out remaining qt5 conditionals 2023-03-18 02:10:20 +03:00
Martin Weinelt
19680e9902
Merge pull request #217568 from trofi/stdenv-parallel-install
stdenv/generic/setup.sh: enable parallel installs for parallel builds
2023-03-15 17:10:19 +00:00
Mathieu Rene
ab570e4a42 sdrangel: fix darwin build
Tested and changed the platform metadata for the dependent libs.
2023-03-12 17:41:55 -04:00
Mathieu Rene
8df017265e qt5.qtwebengine: fix Qt version number in cmake
Previously fixed in 97904f8424
and #118084, but the fix was only applied to linux platforms.

This fixes libraries that depend on qtwebengine under darwin platforms.
2023-03-12 16:12:45 -04:00
Artturi
0c4800d579
Merge pull request #220312 from amjoseph-nixpkgs/pr/qt5/cross/mysqlclient 2023-03-10 19:45:07 +02:00
Adam Joseph
773dfa2228 qt5/qtbase.nix: add mysqlSupport
This commit switches `libmysqlclient`-enablement from `!=null`-style
to `fooSupport`-style, by adding an additional boolean parameter `mysqlSupport`.

This parameter defaults to
`stdenv.hostPlatform==stdenv.buildPlatform`, so there should be no
change in behavior for the non-cross-compiling case.

Co-authored-by: Artturi <Artturin@artturin.com>
2023-03-09 21:37:13 -08:00
Artturin
2cbbef006b qt5: use makeScopeWithSplicing
if there is more than one qt5 attr and this file is copied then the arg
to generateSplicesForMkScope should be changed
2023-03-09 21:16:03 +02:00
Adam Joseph
fa9659e0de qt-5/hooks/fix-qt-builtin-paths.sh: do not hardcode output paths
The fix-qt-builtin-paths.sh script replaces several strings in *.pr*
files with output names; for example

```
$$[QT_HOST_BINS]    is replaced by    $dev
```

This causes problems when cross-compiling: the `mkspecs/qconfig.pri`
in the `$dev` output of `qtbase` will have output names *of qtbase*
hardwired into it.  Since `qmake` is part of the `qtbase` package,
it will pick up these hardcoded paths when compiling the other
modules.

As a result, the `installPhase` of `qtdeclarative` (and other
modules) will attempt to copy their results into the
already-registered store path for `qtbase`.  This will fail, because
Nix prevents writes to a storepath after it has been registered.

Fortunately the `.pri` files understand environment variable
substitution: you can write `$$NIX_OUTPUT_DEV` to tell `qmake` that
it should use the value of the `NIX_OUTPUT_DEV` environment variable
*at `qmake`-run-time* (rather than at `qmake`-build-time).
2023-03-09 03:37:08 -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
3251013cc1 treewide: env.NIX_CFLAGS_COMPILE use toString on result of optionals
env values must be strings
2023-02-22 21:23:05 +02:00
Artturin
226e149145 treewide: env.NIX_CFLAGS_COMPILE use optionalString instead of optional
env values must be strings
2023-02-22 21:23:05 +02:00
Artturin
6b2a05e190 treewide: manual fixups for
treewide: use toString on list NIX_CFLAGS_COMPILE
treewide: move NIX_CFLAGS_COMPILE to the env attrset
2023-02-22 21:23:04 +02: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
github-actions[bot]
b0f16e56b0
Merge staging-next into staging 2023-02-11 18:01:50 +00:00
github-actions[bot]
15bfb025ab
Merge master into staging-next 2023-02-11 18:01:19 +00:00
John Ericson
6ff065a44c qt5.qtbase: Add meta.pkgConfigModules and test 2023-02-11 11:02:58 -05:00
Artturin
4e3dcf364e treewide: makeSetupHook deps -> propagatedBuildInputs 2023-02-07 21:02:00 +02:00
github-actions[bot]
dfee1a3150
Merge staging-next into staging 2023-02-05 00:03:15 +00:00
K900
a25786f76f qt5/qtwebengine: pick patch to fix build with gcc 12 2023-02-04 23:10:53 +03:00
K900
e2d48792c5 qt5/qtwebengine: 5.15.11 -> 5.15.12 2023-02-04 23:10:51 +03:00
Nick Cao
67751b2737
qt5.wrapQtAppsHook: fix interaction with strictDeps 2023-02-01 15:10:50 +08:00
github-actions[bot]
d7e7d75f99
Merge master into staging-next 2023-01-26 06:01:24 +00:00
Weijia Wang
a37e8e1a3e qt5.qtwebengine: unbreak on aarch64-darwin 2023-01-26 02:12:49 +01:00
Alyssa Ross
0ae87d514f treewide: add names to all setup hooks 2023-01-19 15:00:36 +00:00
Nick Cao
5d2dc46263
qt5: update source hashes to include submodules 2023-01-16 08:35:18 +08:00
Nick Cao
0567815a11
qt5: fetch submodules 2023-01-16 08:35:18 +08:00
Nick Cao
231d0821c7
Revert "qt5.qt3d: override src to include submodules"
This reverts commit 886104ad30e88fb37e2b93cac0fd41d469625860.
2023-01-16 08:35:17 +08:00
Nick Cao
c140730d40
qt5.qt3d: override src to include submodules 2023-01-15 17:15:21 +08:00
K900
251474b8cd qt5/qtwebengine: use homebrew version of python3 patches
It works on Mac
2023-01-12 11:34:40 +03:00
K900
3084056119 qt5/qtwebengine: try patching out more Darwin platform checks 2023-01-12 11:34:40 +03:00
K900
7c8ab8cb3b qt5: remove remaining version checks 2023-01-12 11:34:40 +03:00
K900
5802c30687 qt5: build with SDK 11.0 on all Darwins (hopefully) 2023-01-12 11:34:40 +03:00
K900
6159128386 qt5: 5.15.7 -> 5.15.8 2023-01-05 21:42:00 +03:00
Sandro Jäckel
1b84946f07
qt5.qtbase: remove ? null asserts 2022-12-21 23:35:56 +01:00
K900
3ee2fd4af0
Merge pull request #202661 from K900/goodbye-my-qt-goodbye
treewide: drop Qt5 < 5.15
2022-12-03 10:51:44 +03:00
K900
06624cd934 qt5: drop 5.12, 5.14 2022-12-03 10:49:53 +03:00