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
Pavol Rusnak
ca00abc407
qt5{12,14,15}: use default stdenv on darwin
2021-12-25 18:48:44 +01:00
Dmitry Kalinkin
12ba3bc6eb
qt5.qtgamepad: add darwin support
2021-12-17 13:25:28 -05: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
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
Sandro Jäckel
3095193e7e
qtbase: format, cleanup, remove darwin from inputs
2021-07-27 15:17:41 +02:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging
2021-05-10 09:45:47 +02:00
Orivej Desh
7c46cfbc02
qtwebkit: fix linux build with glib 2.68 ( #122259 )
2021-05-09 04:55:05 +00:00
OPNA2608
bca2dfc7de
qt514.qtbase: Fix qtPrepareTool function
2021-05-08 20:40:44 -07:00
Gabriel Ebner
1cf80c56e3
qt514.qtwayland: fix build
2021-04-09 09:26:12 +02:00
Bastian Köcher
96a0d6a810
qtwebkit: Fix build with icu 68
2021-02-28 13:35:55 +01:00
github-actions[bot]
1b5da764a7
Merge staging-next into staging
2021-01-27 12:24:09 +00:00
Ben Siraphob
3bbad8b041
treewide: remove inherited stdenv.lib
2021-01-27 12:44:43 +07:00
Thomas Tuegel
7744998f04
qtbase: Set cmakeFlags and NIX_CFLAGS_COMPILE in setupHook
2021-01-25 15:56:05 -06: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
Ben Siraphob
2f78ee7e81
pkgs/development: stdenv.lib -> lib
2021-01-24 00:16:29 +07:00
Orivej Desh
ff612c5e56
qt514.qtwebengine: fix build with gcc10
2021-01-05 17:27:41 +00: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
e823016e66
Merge master into staging-next
2020-12-31 13:29:32 +01:00
Sandro Jäckel
d05ff6e0f4
qt514.qtwebkit: Fix patch applying
2020-12-29 19:41:51 +01:00
Doron Behar
6d13b4c5ec
qt5: Update comment regarding updating srcs.nix
2020-12-28 19:52:06 +02:00
Thomas Tuegel
3db04334e3
Revert "fetch-kde-qt.sh: get hashes from metadata"
...
This reverts commit 4b7d9dc868
2020-12-26 05:24:25 -06:00
Dmitry Kalinkin
0c74da1342
qt5{14,15}.qtbase: fix on darwin
2020-11-17 10:04:09 -05:00
Frederik Rietdijk
986c2d36da
Merge master into staging-next
2020-11-16 09:01:53 +01:00
Andrew Childs
1f52024720
qt514.qtbase: patch framework detection to support tbd frameworks
2020-11-12 16:57:19 +09:00
Dmitry Kalinkin
ee2501f124
qt5.qtwebengine: don't override patches in qtModule
...
This fixes darwin build.
Fixes: 90db9641
2020-11-09 21:11:59 -05:00
Fabian Möller
f82565f87d
qt5.qtwebkit: fix build with bison-3.7
2020-08-27 11:42:53 +02:00
Jamie
4cb5383141
qt: bring back QML import patch in 5.14 ( #95772 )
...
This was missed in the 5.12 -> 5.14 update process.
Resolves #95636
2020-08-19 02:56:19 +02:00
Milan Pässler
d4c607aa71
qt5: 5.12.7 -> 5.14.2
...
This includes contributions by @ttuegel and @DizFer. Thanks!
2020-07-31 18:50:58 +02:00
