Commit Graph

836 Commits

Author SHA1 Message Date
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
Renaud
944a2dc835
Treewide: fix some permanent redirects on homepages
(#153213)
Issue #60004
2022-01-03 16:53:12 +01:00
Pavol Rusnak
5581f0f82f
qt5.qtwebengine: clarify on which platform is the package broken 2021-12-25 18:48:44 +01:00
Pavol Rusnak
af8c095665
qt5{12,14,15}: mark broken on aarch64-darwin 2021-12-25 18:48:44 +01:00
Pavol Rusnak
ca00abc407
qt5{12,14,15}: use default stdenv on darwin 2021-12-25 18:48:44 +01:00
github-actions[bot]
39d035c4cf
Merge master into staging-next 2021-12-22 00:01:35 +00:00
Dmitry Kalinkin
88171cca9b
qt5.qtbase: reinstate -Wno-error=unguarded-availability on darwin 2021-12-20 11:48:22 -05:00
Dmitry Kalinkin
e1aaaa90fe
llvmPackages.libcxx: unset _LIBCPP_USE_AVAILABILITY_APPLE 2021-12-18 10:09:25 -05:00
Dmitry Kalinkin
12ba3bc6eb
qt5.qtgamepad: add darwin support 2021-12-17 13:25:28 -05:00
Dmitry Kalinkin
5f5bc79a1b
qt5{14,15}.qtbase: fix build on darwin 2021-12-15 09:57:32 -05:00
github-actions[bot]
0242879f3f
Merge master into staging-next 2021-12-14 12:01:17 +00:00
Sandro
2c2a09678c
Merge pull request #149461 from SuperSandro2000/fix-version-qtwebengine 2021-12-14 11:08:24 +01:00
github-actions[bot]
c6ad49e2f0
Merge master into staging-next 2021-12-12 00:01:54 +00: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
toonn
2a97abdc21 Qt5: WebEngine build with old LLVM
Qt Base is built with LLVM 5 on Darwin. LLVM 11 causes problems for
WebEngine because of the "version" includes in libc++abi. LLVM 7 would
work but since parts are built with LLVM 5 anyway it seemed like a more
straightforward option.
2021-11-24 15:17:13 -08:00
toonn
b1b5b40c8d Qt5: WebEngine turn off warning causing errors
Co-authored-by: Jonathan Ringer <jonringer117@gmail.com>
2021-11-24 15:17:13 -08:00
Fabián Heredia Montiel
6b8044795e qtwebengine: 5.15.6 → 5.15.7 2021-11-21 11:53:19 -08:00
Kim Lindberger
855a211fd9
Merge pull request #145473 from talyz/qt512-big-sur-fix
qt512: Make apps work on macOS Big Sur
2021-11-15 19:46:52 +01:00
github-actions[bot]
0ca0546665
Merge master into staging-next 2021-11-14 06:01:05 +00:00
Dmitry Kalinkin
b507efd2bc
qt51{4,5}.qtwebengine: mark as broken on darwin 2021-11-13 20:14:18 -05:00
talyz
39ce18a7ec
qt512: Make apps work on macOS Big Sur
Make Qt applications work on macOS Big Sur even if they're built with
an older version of the macOS SDK (<10.14 - we're currently using
10.12). This issue is fixed in 5.12.11, but it requires macOS SDK
10.13 to build. See https://bugreports.qt.io/browse/QTBUG-87014 for
more info.
2021-11-11 11:11:08 +01:00
Thomas Tuegel
5b22f14d38
qtbase: avoid rebuilding versions < 5.15 2021-10-31 12:02:20 -05:00
Thomas Tuegel
27b6cf2445
qtModule: combine conditionals inside evaluation brackets
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-31 11:38:56 -05: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
Thomas Tuegel
42f44590e0
qtModule: say the magic words 2021-10-30 09:52:39 -05:00
Thomas Tuegel
8475a67e7d
qtbase: bootstrap with syncqt.pl 2021-10-30 09:52:38 -05:00
github-actions[bot]
b7725a001d
Merge staging-next into staging 2021-10-04 18:01:44 +00:00
github-actions[bot]
150dc67b3c
Merge master into staging-next 2021-10-04 18:01:07 +00:00
figsoda
b995290d0b
Merge pull request #140493 from figsoda/lib-optional-list
treewide: avoid use of lib.optional with list in inputs
2021-10-04 13:42:25 -04:00
figsoda
3109ff5765 treewide: avoid use of lib.optional with list in inputs 2021-10-04 13:02:42 -04: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
Dmitry Kalinkin
60055478c9
wrapQtAppsHook: fix a typo 2021-09-29 14:54:51 -04:00
Dmitry Kalinkin
1327726568
wrapQtAppsHook: add extra paths for macOS applications 2021-09-29 14:51:50 -04:00
Dmitry Kalinkin
ee33a90c56
qt: use isELF and isMachO in wrapQtAppsHook 2021-09-28 10:13:44 -04:00
github-actions[bot]
c836da689f
Merge staging-next into staging 2021-09-23 00:03:12 +00:00
Vladimír Čunát
314e0f22d8
qt512: fixup build of qtwayland
https://github.com/NixOS/nixpkgs/pull/138268#issuecomment-923135098
It's now not commonly used in Linux NixPkgs; I suppose it will be better
this way than failing.
2021-09-23 01:39:24 +02:00
adisbladis
6edb3d3001
Merge pull request #136493 from tweag/qtbase-parallel-build
qt5.qtbase: Enable parallel building
2021-09-20 16:47:55 -05:00
Artturi
7d2157605e
Merge pull request #126710 from Artturin/build-qt-with-atspi
qt5: add at-spi2-core to qtbase
2021-09-20 23:54:55 +03:00
Sergei Trofimovich
042119cade qt514.qt3d: fix upstream URL
hydra can't build qt514.qt3d binary as it fails to fetch the tarball
from outdated source from:
    https://download.qt.io/official_releases/qt/
as it only contains `5.12`, `5.15`, `6.0` and `6.2`.

`/archive` still has the releases:
    https://download.qt.io/archive/qt/5.14/5.14.2/submodules/

Let's use those instead.
2021-09-11 17:20:03 +01:00
adisbladis
54a62ba008
qt5.qtbase: Enable parallel building 2021-09-02 14:03:33 -05:00
Artturin
1e8752a150 qt5: add at-spi2-core to qtbase 2021-09-02 17:10:53 +03: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