Commit Graph

891 Commits

Author SHA1 Message Date
toonn
4f1480eb29
Qt5: WebEngine turn off warning causing errors 2022-01-17 13:29:46 +01: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
Thomas Tuegel
61c158b34d
Merge pull request #153133 from veprbl/pr/qtbase_darwin_without_gtk
qt5.qtbase: build without GTK support on darwin
2022-01-08 10:36:00 -06: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
Renaud
944a2dc835
Treewide: fix some permanent redirects on homepages
(#153213)
Issue #60004
2022-01-03 16:53:12 +01:00
Dmitry Kalinkin
9820587b93
qt5.qtbase: build without GTK support on darwin 2022-01-01 19:09:59 -05: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
Maximilian Bosch
b3823a35e5
qtwayland: declare proper app_id for wrapped executables
Since NixOS 21.11 it seems as if QT uses Wayland if possible[1].
However, my `pinentry-qt` flavor stopped floating because it's now
running in Wayland-mode rather than in XWayland mode where this seems to
be fine.

I wanted to add a rule to my `sway(1)`-config for that, but realized
that `pinentry` is missing an `app_id` to match:

    $ swaymsg -t get_tree | jq '.nodes[2].nodes[1].nodes[1].nodes[1].app_id'
    ""

This is because `QWaylandWindow::initWindow()` uses the application's
`baseName` to determine the app window. Unfortunately the `baseName`
drops all chars of the filename after the first dot[2]. This means that
every wrapped Nix package (i.e. `pkgs.foo` with `$out/bin/.foo-wrapped`)
will have an empty-string as baseName because the first character of the
filename is a dot. Since we're using the `wrapQtAppsHook` quite
excessively, a lot of programs are affected by this.

In order to work around this, I implemented a small patch for
`qtwayland` that strips away the `nixpkgs`-specific `.(name)-wrapped` of
a filename if needed and then sets the `app_id` to the expected
`baseName`. This is useful to make e.g. `sway`-configs with
`for_window`[3]-expressions from other distros compatible.

With this change, the `app_id` is set as I'd expect it:

    $ swaymsg -t get_tree | jq '.nodes[2].nodes[1].nodes[1].nodes[1].app_id'
    "pinentry-qt"

Even though we'll need the patch to get e.g. `foo` from `.foo-wrapped`,
I decided to file a bug-report against upstream[4].

[1] https://nixos.org/manual/nixos/stable/release-notes.html#sec-release-21.11
[2] https://doc.qt.io/qt-5/qfileinfo.html#baseName
[3] https://man.archlinux.org/man/sway.5.en
[4] https://bugreports.qt.io/browse/QTBUG-99137
2021-12-24 15:36:52 +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
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
4c095c59ba
Merge pull request #125572 from prusnak/qt5-darwin 2021-07-26 09:15:45 +00:00
Sandro
5bd0c66364
Merge pull request #130053 from IvarWithoutBones/fix/qtbase-gcc11 2021-07-23 14:30:18 +02:00
Pavol Rusnak
ce14ca10a6
qt5: use xcbuild on darwin, cleanup 2021-07-22 21:59:02 +02:00
Pavol Rusnak
afb3563bdc
qt5: don't use dontUseXcbuild in qtwebengine
dontUseXcbuild was dropped in 0534ceac81
2021-07-22 21:59:02 +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
Sandro Jäckel
388a4ef423
treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-* 2021-07-14 03:35:21 +02:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03: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
Florian Klink
ac078761ce
Merge pull request #124078 from flokli/qtwebengine-conditional-pipewire
qtwebengine: only set -webengine-webrtc-pipewire with qt >= 5.15
2021-05-23 12:36:28 +02:00
Florian Klink
4cbb20402a qtwebengine: only set -webengine-webrtc-pipewire with qt >= 5.15
This fails the build of qt514.qtwebengine otherwise:

```
QMAKEPATH=/nix/store/29n056mi3pji6si51b128pa67b1qr7wq-qtbase-5.14.2-dev:/nix/store/g7wady1f1r23wlmy4q1f3b8j2fj5q2sq-qtdeclarative-dev:/nix/store/xfqnh2pma99915d4gsanls68z1jikcpx-qtsvg-dev:/nix/store/zlnsjdj5yv1ivi1miq49j9gp382byl35-qtlocation-dev:/nix/store/lb7cidi60cabpa7swv51xnss9045vqzi-qtmultimedia-dev:/nix/store/jrk6bcqihxwsszwy6rwy2vnfc2sb4rv9-qtwebchannel-dev
qmake PREFIX=/nix/store/pa3jhipp59f6ykh9k8l8z8jf88k52bz8-qtwebengine NIX_OUTPUT_OUT=/nix/store/pa3jhipp59f6ykh9k8l8z8jf88k52bz8-qtwebengine NIX_OUTPUT_DEV=/nix/store/jngs3qilw9iiv97rawb9sb9sd6qdbp2s-qtwebengine-dev NIX_OUTPUT_BIN=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin NIX_OUTPUT_DOC=/nix/store/jngs3qilw9iiv97rawb9sb9sd6qdbp2s-qtwebengine-dev/share/doc/qt-5.14.2 NIX_OUTPUT_QML=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin/lib/qt-5.14.2/qml NIX_OUTPUT_PLUGIN=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin/lib/qt-5.14.2/plugins CONFIG+=release -- -system-ffmpeg -webengine-webrtc-pipewire -proprietary-codecs
Info: creating stash file /build/qtwebengine-everywhere-src-5.14.2/.qmake.stash
Info: creating cache file /build/qtwebengine-everywhere-src-5.14.2/.qmake.cache
ERROR: Unknown command line option '-webengine-webrtc-pipewire'.
builder for '/nix/store/g6dvr7789sswmahlxc6zs5pr8k2g5pgy-qtwebengine.drv' failed with exit code 3
```

Also, only bring in pipewire_0_2 if we enable pipewire support.
2021-05-23 00:44:43 +02:00
github-actions[bot]
2b12bace86
Merge master into staging-next 2021-05-21 06:22:09 +00:00
John Axel Eriksson
7a714e8ed2
qtwebengine: enable pipewire/webrtc 2021-05-20 07:58:50 +02:00
Thomas Tuegel
e45c0ea4cd
Restore version in Qt derivation names 2021-05-14 05:53:30 -05:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
Vladimír Čunát
5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
Orivej Desh
7c46cfbc02
qtwebkit: fix linux build with glib 2.68 (#122259) 2021-05-09 04:55:05 +00:00
OPNA2608
77b148ddd7 qt5.qtwebengine: remove syncqt workaround 2021-05-08 20:40:44 -07:00
OPNA2608
8307e6dc20 qt515.qtbase: Fix qtPrepareTool function 2021-05-08 20:40:44 -07:00
OPNA2608
bca2dfc7de qt514.qtbase: Fix qtPrepareTool function 2021-05-08 20:40:44 -07:00
OPNA2608
e7333f7a5e qt512.qtbase: Fix qtPrepareTool function 2021-05-08 20:40:44 -07:00
github-actions[bot]
c63e69cd89
Merge staging-next into staging 2021-05-06 12:23:32 +00:00
Robert Schütz
6ba83717fe libsForQt5.qtwebengine: always use system ffmpeg 2021-05-01 16:10:26 +02:00
Robert Schütz
6de7e0d758 libsForQt5.qtwebengine: use ffmpeg instead of ffmpeg_3 2021-04-25 23:08:55 +02:00
github-actions[bot]
96df3c3794
Merge staging-next into staging 2021-04-19 12:06:26 +00:00
Vladimír Čunát
b0dae10ba7
qt5.qtwebengine, webkitgtk: try harder to avoid timeouts
I hope this will improve the situation on aarch64-linux.
I don't think it could make anything worse.
Recent staging-next timeouts:
https://hydra.nixos.org/build/141551270
https://hydra.nixos.org/build/141547098

For now let's not touch meta.timeout, as there's less consensus and the
setting seems less reliable in practice, too.
2021-04-19 13:21:48 +02:00
Thomas Tuegel
0765db9135
Merge pull request #119526 from dotlambda/qtModule-pname
qtModule: use pname and version
2021-04-17 17:57:37 -05:00
Robert Schütz
d0568d305a qtModule: use pname and version 2021-04-15 11:38:45 +02:00
Gabriel Ebner
1cf80c56e3 qt514.qtwayland: fix build 2021-04-09 09:26:12 +02: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
Dylan Baker
5cd983f6d3 qt5: Include the "out" derivation as well as the "dev" in qt5.full
Without a number of important Qt libraries (all of those with a "dev"
derivation) are not included in the bundled package, and qmake can't
find them.

Fixes #110199
2021-03-23 13:37:20 -07:00
Andrew Childs
a5979a4f99 qtwebengine: switch to pure sandbox on darwin 2021-03-20 11:32:32 -04:00
Bastian Köcher
96a0d6a810
qtwebkit: Fix build with icu 68 2021-02-28 13:35:55 +01:00
github-actions[bot]
79b7a67b55
Merge master into staging-next 2021-02-17 00:36:31 +00:00
Robert Hensing
46a4d53063 qtwebengine: Increase build timeout to 24h
The default 10h timeout caused the cancellation of builds on
aarch64-linux builders.
Perhaps counterintuitively, this wastes resources because it
requires a restart, but never completes.

https://hydra.nixos.org/build/136917190
2021-02-16 10:17:55 +01:00
github-actions[bot]
30dddce5e8
Merge master into staging-next 2021-02-09 06:16:02 +00:00
Bernardo Meurer
b95c84c964
qt5.qtwebkit: remove flashplayerFix 2021-02-08 09:38:47 -08:00
github-actions[bot]
f9141c9fc1
Merge staging-next into staging 2021-02-03 00:39:57 +00:00