Commit Graph

144 Commits

Author SHA1 Message Date
Theodore Ni
c173b99c6c
Merge branch 'master' into staging-next
Resolve correctly the three-way merge between https://github.com/NixOS/nixpkgs/pull/251681,
https://github.com/NixOS/nixpkgs/pull/227900, and https://github.com/NixOS/nixpkgs/pull/246022
2023-08-26 19:00:58 -07:00
Samuel Dionne-Riel
6e8985702c
Revert "qt5.qtbase: fix cross" 2023-08-26 19:08:53 -04:00
Theodore Ni
80a74ec050
Merge branch 'master' into staging-next
Manually fixed a merge conflict between https://github.com/NixOS/nixpkgs/pull/227900
and https://github.com/NixOS/nixpkgs/pull/246022.
2023-08-26 16:08:02 -07:00
Adam Joseph
a6187bbbcb
Merge pull request #227900 from amjoseph-nixpkgs/pr/qtbase/fixcross
qt5.qtbase: fix cross
2023-08-26 21:31:39 +00:00
Adam Joseph
1430b56362 qt5.qtbase: fix cross compilation
This commit fixes builds of `pkgsCross.*.qt5.qtbase` by:

- Adding the buildPlatform compiler to depsBuildBuild in qtbase.nix
  and qtModule.nix.  The `qtbase` build machinery expects to find it
  in the $PATH in unprefixed form.

- Setting the `PKG_CONFIG_SYSROOT_DIR` and `PKG_CONFIG_LIBDIR`
  environment variables when compiling a cross-targeted `qmake`.
  This is required; if these environment variables are unset,
  `qmake` won't even try to use `pkg-config`.

- Adding the `-device` and `-device-option` flags necessary for
  cross compilation to `configureFlags`.

- Adding the (one-entry at the moment) Rosetta Stone for QT-5 as a
  `let`-defined `qtPlatform` function which takes a nixpkgs platform
  and returns a QT-5 `mkspecs`-string.

Co-authored-by: Christoph Neidahl <christoph.neidahl@gmail.com>
2023-08-20 21:41:19 -07:00
Theodore Ni
d494084017
Merge branch 'staging-next' into staging
Merging https://github.com/NixOS/nixpkgs/pull/245957 with https://github.com/NixOS/nixpkgs/pull/246022.
2023-08-20 20:09:45 -07:00
Theodore Ni
dab839357e
Merge branch 'master' into staging-next
Had to merge https://github.com/NixOS/nixpkgs/pull/245957 and
https://github.com/NixOS/nixpkgs/pull/247245.
2023-08-20 12:01:22 -07:00
K900
2d21b73a7f
Merge pull request #249604 from PaulSalden/submit/qt5-qtremoteobjects
libsForQt5.qt5.qtremoteobjects: init at 5.15.9
2023-08-20 20:43:11 +03:00
Artturi
bde196dde9
Merge pull request #245957 from amjoseph-nixpkgs/pr/lib/customization/makeScopeWithSplicing2 2023-08-20 18:57:05 +03:00
Theodore Ni
ece0953571
Merge branch 'staging-next' into staging 2023-08-18 16:02:27 -07:00
Paul Salden
0396748c12 libsForQt5.qt5.qtremoteobjects: init at 5.15.9
https://doc.qt.io/qt-5/qtremoteobjects-index.html
2023-08-16 21:40:14 +02:00
github-actions[bot]
583df4e091
Merge master into staging-next 2023-08-16 18:01:01 +00:00
K900
c85be71df4
Merge pull request #247726 from vlaci/qtwebengine-pulse
qtwebengine: link to pulseaudio
2023-08-16 18:13:17 +03:00
K900
e7ced4364b
Merge pull request #249182 from K900/qt5-dbus-crash-backport
qt5.qtbase: backport patch to fix things crashing on exit
2023-08-15 22:18:56 +03:00
K900
68cc02588d qt5: include qttranslations properly
Qt loads its own translations from a hardcoded path, and those are used
(among other things) for determining RTL layout preferences in applications,
so they are definitely something we want to have.

This adds a qtbase/qttools rebuild to the chain, but it's fast enough that it's
probably fine.

Another approach would be to load translation paths from the environment,
and inject it in wrapQtAppsHook, but that seems like more complexity
for very questionable build time savings.
2023-08-15 22:11:10 +03:00
K900
0f5c7b4827 qt5.qtbase: backport patch to fix things crashing on exit
This is kind of experimental, and we decided after a conversation
with upstream to keep it vendored for a bit and then upstream if
nothing explodes.

666ce51d4e
2023-08-15 00:53:12 +03:00
László Vaskó
e4dcdb133a qtwebengine: link to pulseaudio
Nix builds of QTWebEngine doesn't support sound output via Pulse, only
through ALSA, unless sandboxing is disabled and LD_LIBRARY_PATH
contains a reference to the Pulse libraries.

By default, Chromium won't link to PulseAudio, but dlopens it in
run-time. It is tricky to make this work because of the nontrivial
sandbox configuration. Nix builds of Chromium already link against
Pulse directly, so it makes sense to copy this behavior in
QTWebEngine.
2023-08-14 19:33:19 +02:00
Adam Joseph
cbc8aa437c treewide: use uncurried version of makeScopeWithSplicing 2023-08-14 02:51:10 +03:00
K900
13bd5d4dbd qt5.qtscript: fix version
No upstream changes so the version number stayed at 5.15.9 I guess?
2023-08-13 09:25:48 +03:00
K900
0aaf677516 qtwebengine: 5.15.13 -> 5.15.14, remove hack 2023-08-11 09:15:07 +03:00
K900
e9b39616ec qt5: 5.15.9 -> 5.15.10 2023-08-10 17:23:34 +03:00
Silvan Mosberger
a0b8caf3bc
Revert "lib.customisation: uncurry makeScopeWithSplicing" 2023-07-28 23:04:09 +02:00
lelgenio
f6a944e359 qt5: remove overrideScope' 2023-07-28 13:54:14 -03:00
Artturin
3716ef19d8 lib.makeScopeWithSplicing: provide default for keep,extra
These are often unneeded by the user.
2023-07-28 17:41:01 +03:00
Adam Joseph
cb13669b00 lib.customisation: uncurry makeScopeWithSplicing
Deeply-curried functions are pretty error-prone in untyped languages
like Nix.  This is a particularly bad case because
`top-level/splice.nix` *also* declares a makeScopeWithSplicing, but
it takes *two fewer arguments*.

Let's switch to attrset-passing form, to provide some minimal level
of sanity-checking.
2023-07-27 21:31:59 -07:00
K900
53c4a1381f qt5: update patches
Pull in some qtbase security fixes
2023-05-28 14:05:33 +03:00
Christoph Neidahl
434cd1057f
libsForQt5.qtpim: init at unstable-2020-11-02 (#214164)
* libsForQt5.qtpim: init at unstable-2020-11-02

* libsForQt5.qtpim: Move to pkgs/development/libraries/qt-5

* libsForQt5.qtpim: unstable-2020-11-02 -> unstable-2021-04-09

By try reverting Qt6 commits instead of pulling in Qt5-compatible ones

* Revert "libsForQt5.qtpim: unstable-2020-11-02 -> unstable-2021-04-09"

This reverts commit 9384825791.
2023-05-25 21:44:39 +02:00
Weijia Wang
09aba852bf libsForQt5.qtconnectivity: fix build on darwin 2023-05-08 21:16:38 +03:00
K900
40cac1db49
Merge pull request #224356 from panicgh/qtdatavis3d
qt5.qtdatavis3d: init module
2023-05-05 09:55:57 +03:00
Nicolas Benes
df49d775de qt5.qtdatavis3d: init module 2023-04-24 18:22:03 +02:00
github-actions[bot]
7d385961eb
Merge master into staging-next 2023-04-23 18:01:26 +00:00
Sandro
87378fb42b
Merge pull request #223960 from OPNA2608/init/qtpositioning 2023-04-23 17:58:34 +02:00
Ryan Lahfa
1a689954ab
Merge pull request #225881 from matklad/makeBinaryWrapper
write-qt-apps-hook.sh: use make-binary-wrapper for significant speedups
2023-04-16 17:52:28 +02:00
github-actions[bot]
5f6ff7e8cf
Merge staging-next into staging 2023-04-15 00:02:38 +00:00
Christoph Neidahl
bfc75c7491
libsForQt5.qtsystems: init at unstable-2019-01-03 (#214179) 2023-04-15 00:42:03 +02:00
github-actions[bot]
ae00b7fb14
Merge staging-next into staging 2023-04-13 00:02:47 +00:00
Weijia Wang
02c564de3c qt5.qtwebengine: fix build on aarch64-darwin 2023-04-12 20:03:30 +03:00
Aleksey Kladov
e8ce8afd55 write-qt-apps-hook.sh: use make-binary-wrapper for significant speedups
QT apps tend to call makeWrapper with a lot of arguments, which causes
noticable slowdowns (+100ms for app startup). The slow down boils down
to two reasons:

- the required string processing is O(N^2)
- bash is slow at doing the processing

By using the binary wrapper, we fix the second point, brining the
overhead down from 100ms to just 4ms or thereabouts.

I tested this change by rebuilding my whole system with it (I use
plasma). It booted and it works (that's where I type this commit
message), but I am not 100% sure if this won't break anything else.

Closes: #225871
2023-04-12 12:02:19 +01:00
K900
8e166f4acd qtwebengine: 5.15.12 -> 5.15.13 2023-04-08 23:05:29 +03:00
K900
d616b23b9f qt5: 5.15.8 -> 5.15.9 2023-04-08 23:05:22 +03:00
K900
76973ae3b3 qt5: regularly scheduled patchset update 2023-04-03 20:55:53 +03:00
OPNA2608
ec6f63dae7 libsForQt5.qtpositioning: init at 5.15.2 2023-03-30 22:41:16 +02: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
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
Artturin
4e3dcf364e treewide: makeSetupHook deps -> propagatedBuildInputs 2023-02-07 21:02:00 +02: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
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