Commit Graph

105 Commits

Author SHA1 Message Date
Fabián Heredia Montiel
fb73942a4e qt5: inherit stdenv for modules and override gcc version for qt512 and qt514 2022-04-16 10:56:03 -05:00
Thomas Tuegel
35e673dda2
qtwayland: include app_id patch in module definition 2022-04-06 08:53:47 -05:00
Vladimír Čunát
db57a90dcc
qt5*.qtwayland: deconflict patching
This fixes build in qt514 case.

The usual way here is to provide patches for each qt5 version
separately.  No other module adds them in this generic way.
The problem is when you combine the approaches; qtModule will only
take the list from the module and ignore the version-specific list.
2022-04-05 15:11:56 +02:00
Maximilian Bosch
7605d492a7
qt512.qtwebengine: fix build w/glibc-2.34
Failing Hydra build: https://hydra.nixos.org/build/163120450
2022-02-27 10:26:55 +01:00
Will Cohen
7ec99ea7cf
qt5.qtwebkit: add disambiguate handle for darwin (#156809) 2022-01-27 13:00:11 -05: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
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
Dmitry Kalinkin
9820587b93
qt5.qtbase: build without GTK support on darwin 2022-01-01 19:09:59 -05:00
Pavol Rusnak
ca00abc407
qt5{12,14,15}: use default stdenv on darwin 2021-12-25 18:48:44 +01:00
github-actions[bot]
39d035c4cf
Merge master into staging-next 2021-12-22 00:01:35 +00:00
Dmitry Kalinkin
12ba3bc6eb
qt5.qtgamepad: add darwin support 2021-12-17 13:25:28 -05: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
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
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
Sandro Jäckel
388a4ef423
treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-* 2021-07-14 03:35:21 +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
e7333f7a5e qt512.qtbase: Fix qtPrepareTool function 2021-05-08 20:40:44 -07:00
Bastian Köcher
96a0d6a810
qtwebkit: Fix build with icu 68 2021-02-28 13:35:55 +01: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
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
Fabian Möller
0392271676
qt512: 5.12.9 -> 5.12.10 2021-01-07 14:05:56 +01:00
Thomas Tuegel
9c04596480 qtlocation: backport upstream patch for recent GCC 2021-01-03 10:00:18 +01: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
Frederik Rietdijk
e823016e66 Merge master into staging-next 2020-12-31 13:29:32 +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.

The KDE project has changed their source index pages so that the links to
package metadata files are generated by JavaScript after the page loads. As a
result, wget is no longer able to recursively fetch the package metadata
automatically.
2020-12-26 05:24:25 -06:00
Doron Behar
d342045066 qt512: 5.12.7 -> 5.12.9 2020-12-23 19:06:06 +02:00
Frederik Rietdijk
986c2d36da Merge master into staging-next 2020-11-16 09:01:53 +01:00
Andrew Childs
f6c54e8f08 qt512.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 ('qt5.qtwebengine: fix build with bison-3.7')
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
Ruben Maher
68bf9101d7
qtwebengine: fix build for darwin 2020-08-19 21:57:45 +09:00
Pascal Bach
2cfff96eff qtwebkit: 5.212-alpha-01-26-2018 -> 5.212.0-alpha4 2020-08-07 09:31:52 +02:00
Thomas Tuegel
9cfca08777
Merge pull request #89846 from lelongg/qtserialbus
qt5.qtserialbus: init at 5.12
2020-07-19 14:46:02 -05:00
Gérald Lelong
be7a8df1fa qt5.qtserialbus: init at 5.12 2020-06-08 23:25:04 +02:00
Thomas Tuegel
99d2567515
Merge pull request #86317 from xbreak/qt5-pkg-config
qt5: Add missing include path to pkg-config files
2020-05-28 05:46:52 -05:00
Henk Kalkwater
5ecd99b2bd qt5.qtgamepad: init at 5.12.7 2020-05-14 21:56:30 -07:00
xbreak
ee5975319b
qt5: Add missing include path to pkg-config files
This is achieved by patching qtbase `qmake/generators/makefile.cpp` to
unconditionally add the missing `-I${includedir}`. The include path is
otherwise conditioned on whether it is already available or not. Since there is
no unified set of system include paths in nix this cause problems as reported
in #52457.
2020-05-12 06:25:28 +00:00
Frederik Rietdijk
92124ed660 Merge master into staging-next 2020-04-03 21:54:40 +02:00