public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
295,533 Commits 1 Branch 0 Tags
Commit Graph

185 Commits

Author SHA1 Message Date
adisbladis
dfe2998cba qt5.qtbase: Enable parallel building 
(cherry picked from commit 54a62ba0080cc5d40567dc0f492389e199c6e3a9)
 2021-09-20 21:52:21 +00:00
adisbladis
ed77a24bb5 qt5.qt3d: init module 
(cherry picked from commit a7432ad3115c153a901cd49da24e7b766cce1e21)
 2021-09-02 19:11:00 +00:00
Florian Klink
075ab49dc2 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.

(cherry picked from commit 4cbb20402a88abee9a68b53a8786df5af87b4101)
 2021-05-23 12:37:07 +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
OPNA2608
77b148ddd7 qt5.qtwebengine: remove syncqt workaround 2021-05-08 20:40:44 -07: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
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
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
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
Andrew Childs
a5979a4f99 qtwebengine: switch to pure sandbox on darwin 2021-03-20 11:32:32 -04: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
Jörg Thalheim
d72ebead34
Revert "Merge pull request #109239 from poelzi/qt-debug-symbols" 
This reverts commit 8f69090ba5c031f18f70f5b79c9666bbd600ea91, reversing
changes made to e6a852714ad97418e05d0818fc58ad3378decef7.

In 13e3ec0d58a510742bb12f26d7c451ca4c94ce25 this was already addressed
 2021-01-27 14:27:45 +01:00
Jörg Thalheim
8f69090ba5
Merge pull request #109239 from poelzi/qt-debug-symbols 2021-01-27 10:18:26 +00: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
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
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
Ben Siraphob
2f78ee7e81 pkgs/development: stdenv.lib -> lib 2021-01-24 00:16:29 +07:00
Dmitry Kalinkin
03ef3681b5
qt515.qtwebengine: update darwin patches 
A working build seems to further requre SDK 10.14+ and working that
around is not trivial.
 2021-01-23 11:45:54 -05:00
John Ericson
9c213398b3 lib: Clean up how linux and gcc config is specified 
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.

This reverts commit 0bc275e63423456d6deb650e146120c39c1e0723.
 2021-01-23 10:01:28 -05:00
Jonathan Ringer
0bc275e634
Revert "lib: Clean up how linux and gcc config is specified" 
This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614589ee3acd070a6409b2b9700c92d65.
 2021-01-22 14:07:06 -08:00
John Ericson
8929989614 lib: Clean up how linux and gcc config is specified 
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
 2021-01-21 22:44:09 -05:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix 
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
 2021-01-19 01:16:25 -08:00
Daniel Poelzleithner
0c0d5a2dc4 Update pkgs/development/libraries/qt-5/modules/qtbase.nix 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-01-18 19:56:27 +00:00
Daniel Poelzleithner
f26043ef90 qt5: Add debugging symbols in development builds 
qt5 build with developerBuild do not contain debug information as
they are stripped by the qt build process.
 2021-01-18 19:56:27 +00:00
John Ericson
b03fdcc7f9
Merge pull request #108300 from siraben/parallel-cmake 
treewide: remove enableParallelBuilding = true if using cmake
 2021-01-03 13:22:09 -05:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Thomas Tuegel
9c04596480 qtlocation: backport upstream patch for recent GCC 2021-01-03 10:00:18 +01:00
Doron Behar
983465f13a qt515.qtwebkit: unbreak 🎉 
A copy of #96309 essentially - fix the build of it with bison-3.7.
 2020-11-21 10:54:43 +02:00
Dmitry Kalinkin
ee2501f124
qt5.qtwebengine: don't override patches in qtModule 
This fixes darwin build.

Fixes: 90db9641 ('qt5.qtwebengine: fix build with bison-3.7')
 2020-11-09 21:11:59 -05:00
Dmitry Kalinkin
aa08b8eb73
qt5.qtwebengine: remove dead conditions for pre 5.12 support 
This doesn't change the derivation.
 2020-11-09 15:36:08 -05:00
Thomas Tuegel
b3d72930d8 qtbase: Preserve configuration options on Qt < 5.15 2020-09-07 08:05:38 -05:00
Thomas Tuegel
01bcfd3579 qtwebkit: mark broken with Qt 5.15 2020-09-07 08:05:24 -05:00
Timothy DeHerrera
eb919fa712 qt5: 5.14.2 -> 5.15.0 2020-09-07 08:05:06 -05:00
John Ericson
1965a241fc
Merge pull request #61019 from volth/gcc.arch-amd 
platform.gcc.arch: support for AMD CPUs
 2020-09-01 22:31:16 -04:00
Chuck
4bac8a7a00 qtbase: Move libtiff dependency from qtbase to qtimageformats 2020-08-27 08:47:47 +02:00
Frederik Rietdijk
081bd762e5 Merge staging-next into staging 2020-08-26 08:43:29 +02:00
Fabian Möller
90db9641cb
qt5.qtwebengine: fix build with bison-3.7 (#96295) 2020-08-25 20:13:45 +02:00
Peter Simons
7b527223fd qtdeclarative: revert "Patch for scrollbar regression" 
This reverts commit 5530043208f0bef7. The change breaks the build of
qtquickcontrols. Fixes https://github.com/NixOS/nixpkgs/issues/96159.
 2020-08-25 12:02:15 +02:00
Florian Klink
40d2968ebf
Merge pull request #94354 from flokli/systemd-246 
systemd: 245.6 -> 246
 2020-08-24 12:42:24 +02:00
Jan Tojnar
91104b5417
Merge branch 'master' into staging-next 2020-08-23 02:00:50 +02:00