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 8f69090ba5
, reversing
changes made to e6a852714a
.
In 13e3ec0d58
this was already addressed
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
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 0bc275e634
.
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 8929989614
.
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
Fabian Möller
0392271676
qt512: 5.12.9 -> 5.12.10
2021-01-07 14:05:56 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
...
b04fc593e7
seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Orivej Desh
ff612c5e56
qt514.qtwebengine: fix build with gcc10
2021-01-05 17:27:41 +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
github-actions[bot]
ec161d2240
Merge master into staging-next
2021-01-02 12:24:09 +00:00
Thomas Tuegel
eed06a0da9
Merge pull request #107898 from SuperSandro2000/qtwebkit-darwin
...
qt514.qtwebkit: Fix patch applying
2021-01-02 05:40:09 -06:00
Frederik Rietdijk
e48db707e4
Merge master into staging-next
2021-01-02 08:49:09 +01:00
Thomas Tuegel
54fff8407b
qt512.qtwebengine: update darwin patches
2021-01-01 07:58:34 -06:00
Thomas Tuegel
a61f20e418
qt512: fix build on darwin
2021-01-01 05:32:19 -06:00