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
Lily Foster
4fc551f4dd
qt6.qtbase: fix the libexecdir in the pkg-config config file
...
A few lines above this change, libexec is explicitly moved to the dev
output. Therefore the pkg-config should point to it too.
2023-01-10 19:08:54 -05:00
Nick Cao
496a2f43b4
qt6.qtbase: patch QTEST_ASSERT and other macros to remove reference to qtbase.dev via __FILE__ macro
...
This is safe because they are only used for printing debug messages, alternatives are setting -fmacro-prefix-map=${qtbase.dev}=qtbase.dev in NIX_CFLAGS_COMPILE or injecting #line directives in all header files, but they would interfere with other usages of __FILE__ macro that might depend on the the path to actually point to a file.
2022-12-31 19:35:04 +08:00
Nick Cao
01c8e3d8bb
Revert "qt6.qtdeclarative: reduce closure size by removing reference to qtbase.dev"
...
This reverts commit cec6862940
.
2022-12-31 19:33:39 +08:00
Nick Cao
753da128bd
qt6.qtvirtualkeyboard: add dev output
2022-12-31 19:33:38 +08:00
Nick Cao
60f6a46bbd
qt6.qtbase: remove valgrind from propagatedBuildInputs
...
reduces the build-time closure and the runtime closure of packages accidentally referencing qtbase.dev by nearly 600M
2022-12-31 19:33:28 +08:00
Artturi
bb0949f4e2
Merge pull request #202625 from NickCao/qt6-paths
...
fixes https://github.com/NixOS/nixpkgs/issues/202622
2022-12-30 14:26:16 +02:00
Sergei Trofimovich
36b4518364
Merge pull request #204689 from trofi/qt6Packages.qtwayland-without-xlibsWrapper
...
qt6Packages.qtwayland: drop unused xlibsWrapper
2022-12-06 19:24:34 +00:00
Sergei Trofimovich
87818caa00
qt6Packages.qtwayland: drop unused xlibsWrapper
...
Validated as no change in `out` output with `diffoscope`.
2022-12-05 21:49:11 +00:00
Sergei Trofimovich
12850888ab
qt6Packages.qtbase: drop unused xlibsWrapper
2022-12-05 21:38:43 +00:00
Weijia Wang
c0d8c84f40
qt6.qtbase: add aarch64-darwin support
2022-11-29 00:41:33 +01:00
Weijia Wang
5821ec2478
qt6.qtquick3dphysics: fix build on x86_64-darwin
2022-11-28 23:51:41 +01:00
Weijia Wang
c44dd89bef
qt6.qtbase: fix build on x86_64-darwin
2022-11-28 23:51:41 +01:00
Weijia Wang
df46edff3e
qt6.qtwebview: add aarch64-darwin support
2022-11-28 23:51:41 +01:00
Weijia Wang
dfb9d038c5
qt6.qttools: fix build on aarch64-darwin
2022-11-28 23:51:41 +01:00
Weijia Wang
65a2669c01
qt6.qtspeech: unbreak on aarch64-darwin
2022-11-28 23:51:41 +01:00
Weijia Wang
2e7f0a84c0
qt6.qtserialport: unbreak on aarch64-darwin
2022-11-28 23:51:41 +01:00
Weijia Wang
8091739d36
qt6.qtmultimedia: unbreak on aarch64-darwin
2022-11-28 23:51:41 +01:00
Weijia Wang
1b23119f21
qt6.qtconnectivity: fix build on aarch64-darwin
2022-11-28 23:51:40 +01:00
Nick Cao
a1f9413602
qt6.qttools: set devTools
2022-11-24 11:10:02 +08:00
Nick Cao
fe2b297ca4
qt6.qtbase: do not unconditionally move $out/bin to $dev/bin
2022-11-24 11:09:23 +08:00
Nick Cao
fc0008053f
qt6.qtbase: update cmake patch to not move bin directory to dev output
2022-11-24 11:08:03 +08:00
Peter Hoeg
dc7783ece2
qt6Packages.qttools: fix tool path
2022-11-23 09:27:49 +08:00
Timothy DeHerrera
782bf687ca
Merge pull request #202086 from LibreCybernetics/update-qt6
...
qt6: 6.4.0 → 6.4.1
2022-11-20 19:57:15 -07:00