Robert Schütz
5344965f85
libsForQt5.wrapQtAppsHook: fix cross
2022-06-13 06:40:45 +00:00
Fabián Heredia Montiel
fb73942a4e
qt5: inherit stdenv for modules and override gcc version for qt512 and qt514
2022-04-16 10:56:03 -05:00
Thomas Tuegel
35e673dda2
qtwayland: include app_id patch in module definition
2022-04-06 08:53:47 -05:00
Thomas Tuegel
a4fbb92be0
qt515: update KDE patches
2022-04-06 08:52:07 -05:00
Vladimír Čunát
db57a90dcc
qt5*.qtwayland: deconflict patching
...
This fixes build in qt514 case.
The usual way here is to provide patches for each qt5 version
separately. No other module adds them in this generic way.
The problem is when you combine the approaches; qtModule will only
take the list from the module and ignore the version-specific list.
2022-04-05 15:11:56 +02:00
Martin Weinelt
dd6b901a38
qt515.qtwebengine: drop obsoleted patch regarding glibc2.34 compat
...
It does not apply anymore, which makes the build fail.
2022-03-14 14:36:43 +01:00
Maximilian Bosch
b9078e581b
qt515.qtwebengine: fix build w/glibc-2.34
...
Derived from Fedora 35: d122c01163
Failing Hydra build: https://hydra.nixos.org/build/153232768
2022-02-27 10:25:37 +01:00
Luna Nova
adb8208581
qt515: Update KDE Qt 5.15 patches (20220208)
...
https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/35
2022-02-08 17:01:56 -08:00
Luna Nova
a4e8f00de1
qt515: Update KDE Qt 5.15 patches (20220205)
2022-02-08 16:25:05 -08:00
Luna Nova
f730b8fa36
qt515: Update KDE Qt 5.15 patches
2022-02-08 16:25:05 -08:00
Luna Nova
6f0ae5f6f3
qt515 qtwayland: update to latest KDE patch
2022-02-08 16:25:05 -08:00
Luna Nova
db3df8802c
qt515: Update KDE Qt 5.15 patches
2022-02-08 16:25:05 -08:00
rnhmjoj
00f80f36d2
qtwebengine: 5.15.7 -> 5.15.8
2022-02-01 21:09:46 +01:00
Will Cohen
7ec99ea7cf
qt5.qtwebkit: add disambiguate handle for darwin ( #156809 )
2022-01-27 13:00:11 -05:00
Jan Tojnar
f7aa55946b
Merge branch 'staging-next' into staging
...
; Conflicts:
; nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
; nixos/doc/manual/release-notes/rl-2205.section.md
; pkgs/build-support/libredirect/default.nix
2022-01-10 01:26:05 +01:00
Ben Wolsieffer
f3386ca8cc
qt5: apply makeScope overrides to qtModule
...
qtModule was defined outside of addPackages, which caused it to use a self
variable that isn't affected by updates using overrideScope. This caused
overrides to qtbase to be incompletely applied. I also entirely removed the
outer self variable to prevent it from being accidently used again.
2022-01-08 01:08:23 -05:00
Dmitry Kalinkin
9820587b93
qt5.qtbase: build without GTK support on darwin
2022-01-01 19:09:59 -05:00
Pavol Rusnak
ca00abc407
qt5{12,14,15}: use default stdenv on darwin
2021-12-25 18:48:44 +01:00
Dmitry Kalinkin
12ba3bc6eb
qt5.qtgamepad: add darwin support
2021-12-17 13:25:28 -05:00
Sandro
2c2a09678c
Merge pull request #149461 from SuperSandro2000/fix-version-qtwebengine
2021-12-14 11:08:24 +01:00
Pavol Rusnak
1bc0716555
qt515.qtwebkit: fix build on darwin
...
This fixes the build on darwin by correcting the patch which no longer applies.
2021-12-11 20:23:50 +01:00
Sandro Jäckel
231b2661d0
qt5.qtwebengine: fix duplicated version
2021-12-07 22:34:27 +01:00
Fabián Heredia Montiel
6b8044795e
qtwebengine: 5.15.6 → 5.15.7
2021-11-21 11:53:19 -08:00
Thomas Tuegel
de97acd190
qt515: consolidate bash set short options
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-31 11:37:54 -05:00
Thomas Tuegel
940e668914
qt515: remove unused file
2021-10-31 11:33:42 -05:00
Thomas Tuegel
b9331fbad9
qt515: consolidate extra package sources
2021-10-31 10:59:30 -05:00
Thomas Tuegel
965fcab969
qt515: combine source locks into single JSON file
2021-10-31 10:53:48 -05:00
Thomas Tuegel
9e65eb4cee
qt515: 5.15.2 -> 5.15.3
...
Qt 5.15.3 does not have an official open source release, but the KDE team
maintains a collection of patches (pulled from Qt upstream) that they expect us
to carry.
2021-10-30 11:19:20 -05:00
github-actions[bot]
b7725a001d
Merge staging-next into staging
2021-10-04 18:01:44 +00:00
rnhmjoj
6dbccf4926
qtwebengine: 5.15.5 -> 5.15.6
2021-10-03 11:46:31 +02:00
Elias Probst
5fffa34329
qt5.qtbase: add patch from 363880 to fix MySQL support
...
Without this patch, a MariaDB upgrade to 10.6.3 will break Qt's MySQL
support, as it was using version-based feature flags instead of
functional tests.
This breaks the conversion of QDateTime values in queries, resulting in
the breakage of e.g. Akonadi.
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-01 11:37:42 +02:00
adisbladis
bcddcb26be
Merge pull request #136232 from tweag/qt5-out-of-tree-modules
...
qt5: Expose internal variables to facilitate out-of-tree building of modules
2021-08-31 14:16:32 -05:00
adisbladis
20ce363de4
qt5: Expose internal variables to facilitate out-of-tree building of modules
...
As it is currently it's almost impossible to accomplish something like:
```nix
...
(qt5.callPackage (
{ qtModule, qtbase, qtdeclarative }:
qtModule {
pname = "qt3d";
qtInputs = [ qtbase qtdeclarative ];
outputs = [ "out" "dev" "bin" ];
}
) { })
...
```
because all the required variables such as qtModule are internal-only.
By exposing these it's easier for external projects not to be bound
exactly by the module definitions explicitly listed in nixpkgs.
2021-08-30 15:15:44 -05:00
adisbladis
a7432ad311
qt5.qt3d: init module
2021-08-30 15:10:49 -05:00
Gérald Lelong
b3dcb19184
qt5.qtserialbus: 5.15 ( #134711 )
...
* qt5.qtserialbus: 5.14, 5.15
* take back qtserialbus from qt 5.14
2021-08-19 19:31:05 +02:00
github-actions[bot]
eec0175f9e
Merge staging-next into staging
2021-07-28 18:01:57 +00:00
github-actions[bot]
6fcda9f1ec
Merge master into staging-next
2021-07-28 18:01:16 +00:00
Yuka
3ff7100f05
qt5.qtwebengine: 5.15.3 -> 5.15.5 ( #131123 )
2021-07-28 14:43:08 +02:00
Sandro Jäckel
3095193e7e
qtbase: format, cleanup, remove darwin from inputs
2021-07-27 15:17:41 +02:00
Sandro
5bd0c66364
Merge pull request #130053 from IvarWithoutBones/fix/qtbase-gcc11
2021-07-23 14:30:18 +02:00
Yuka
dd1b4bb133
qt5.qtwebengine: Fix invisible fonts ( #131121 )
...
Fixes #131074
2021-07-22 21:27:58 +02:00
IvarWithoutBones
a13ae31c53
libsForQt515.qtbase: fix gcc11 compatibility
2021-07-14 16:12:24 +02:00
Benjamin Hipple
e118da1603
qt5.qtgamepad: actually build module
...
This was missing from the `callPackage` list, which meant we were not building it at all.
2021-05-31 14:42:46 -04:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging
2021-05-10 09:45:47 +02:00
Orivej Desh
7c46cfbc02
qtwebkit: fix linux build with glib 2.68 ( #122259 )
2021-05-09 04:55:05 +00:00
OPNA2608
8307e6dc20
qt515.qtbase: Fix qtPrepareTool function
2021-05-08 20:40:44 -07:00
rnhmjoj
97904f8424
qt5.qtwebengine: fix Qt version number in cmake
...
This fixes the build failures in packages depending on qtwebengine and
using cmake to find the Qt dependencies (like libsForQt5.messagelib).
2021-03-31 12:32:21 +02:00
rnhmjoj
a1452f6ed0
qt5.qtwebengine: fix source exceeding output limit
...
This hack reduces the source derivation size from 3.7G to 450M by
removing the src/3rparty submodule .git directory and compressing
the whole directory. This is needed to avoid the 2G limit on hydra.
2021-03-29 10:37:34 +02:00
rnhmjoj
3aba63ab29
qt5.qtwebengine: 5.15.2 -> 5.15.3-a059e740
...
This updates the base chromium branch from 83 to 87, which fixes
approximately a few hundreds CVEs.
2021-03-27 12:35:06 +01:00
Bastian Köcher
96a0d6a810
qtwebkit: Fix build with icu 68
2021-02-28 13:35:55 +01:00