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
Dmitry Kalinkin
6ba1fbdd37
Merge pull request #110605 from veprbl/pr/qt515_qtwebengine_darwin_patch_update
...
qt515.qtwebengine: update darwin patches
2021-02-02 13:34:18 -05:00
github-actions[bot]
104c56e909
Merge staging-next into staging
2021-02-01 00:47:02 +00:00
Thomas Tuegel
f3f4cbfc07
Merge pull request #108687 from B4dM4n/qt512-update
...
qt512: 5.12.9 -> 5.12.10
2021-01-31 14:16:17 -06:00
Jörg Thalheim
d72ebead34
Revert "Merge pull request #109239 from poelzi/qt-debug-symbols"
...
This reverts commit 8f69090ba5e6a852714a13e3ec0d58
2021-01-27 14:27:45 +01:00
github-actions[bot]
1b5da764a7
Merge staging-next into staging
2021-01-27 12:24:09 +00:00
Jörg Thalheim
8f69090ba5
Merge pull request #109239 from poelzi/qt-debug-symbols
2021-01-27 10:18:26 +00:00
Sandro
ad97ca4e51
Merge pull request #110912 from siraben/stdenv-lib-inherit
...
treewide: remove inherited stdenv.lib
2021-01-27 10:28:55 +01:00
Ben Siraphob
3bbad8b041
treewide: remove inherited stdenv.lib
2021-01-27 12:44:43 +07:00
Thomas Tuegel
0e418a1a18
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
...
Qt: Do not require mkDerivation
2021-01-26 16:24:41 -06:00
Thomas Tuegel
13e3ec0d58
qtbase: Keep debug symbols with developerBuild
2021-01-25 15:56:21 -06:00
Thomas Tuegel
5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook
2021-01-25 15:56:15 -06:00
Thomas Tuegel
67b7cffaec
wrapQtAppsHook: only run the hook once
2021-01-25 15:56:15 -06:00
Thomas Tuegel
3320cdf9f1
qt5.mkDerivation: enableParallelBuilding is default
2021-01-25 15:56:14 -06:00
Thomas Tuegel
7744998f04
qtbase: Set cmakeFlags and NIX_CFLAGS_COMPILE in setupHook
2021-01-25 15:56:05 -06:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed
2021-01-25 18:31:47 +01:00
Thomas Tuegel
b80ce0aeca
qmake: Select debug or release build
...
The qmake hook sets its own `CONFIG+=debug` or `CONFIG+=release` depending on
how `qtbase` was built. We no longer rely on using the custom deriver for this
feature.
2021-01-24 09:51:34 -06:00
John Ericson
12881a7aa7
Merge pull request #110544 from Ericson2314/no-platform
...
top-level, lib: Remove platform attribute of platforms
2021-01-23 16:32:36 -05:00
