Commit Graph

312 Commits

Author SHA1 Message Date
Wolfgang Walther
352f462ad9
{qt5,qt6}: remove overrideScope' errors
Scheduled for removal for 24.11.
2024-11-22 21:01:54 +01:00
Emily
51190abf62 qt6: expose darwinVersionInputs
This is a little gross as it’s not a very good name and should
really be considered an internal API, but PySide wants it.
2024-11-08 21:22:24 +00:00
K900
c8aec3b28a qt: editing pass on docs 2024-11-07 21:57:17 +02:00
rewine
9501a20539 qtbase-setup-hook: add wrapQtAppsNoGuiHook to error message
Co-authored-by: eclairevoyant <contactmeongithubinstead@proton.me>
2024-11-07 21:57:17 +02:00
Artturin
ff6a0848ca qt6.wrapQtAppsHook: Only propagate plugins,qml of qtwayland
qt6.{wrapQtAppsHook,wrapQtAppsNoGuiHook}: propagate `qtbase` plugins

https://www.github.com/NixOS/nixpkgs/pull/352419#discussion_r1823132984
2024-11-07 21:57:17 +02:00
rewine
f542c493ad qt6.qtwayland: set meta.{platforms,badPlatforms} 2024-11-07 21:57:17 +02:00
rewine
b7cd0d3c88 qt6.wrapQtAppsNoGuiHook: init
Unlike wrapQtAppsHook, wrapQtAppsNoGuiHook does not propagate qtwayland,
to reduce closure size for CLI or other non-GUI applications.

Co-authored-by: eclairevoyant <contactmeongithubinstead@proton.me>
2024-11-07 21:57:16 +02:00
rewine
ae4fd669e4 qt6.wrapQtAppsHook: add qtwayland to propagatedBuildInputs
qtwayland client side is the wayland platform plugin, provides a way to run Qt applications as Wayland clients
without this, Qt applications only work on x11/xwayland

Co-authored-by: Artturin <Artturin@artturin.com>
2024-11-07 21:57:16 +02:00
github-actions[bot]
f899bb5680
Merge staging-next into staging 2024-11-05 18:05:09 +00:00
K900
2a27e9054c qt6.qtdeclarative: backport a patch fixing crashes in Kirigami apps 2024-11-05 10:01:27 +03:00
Emily
ed28ebdbb4 qt6Packages.*: don’t propagate Darwin version inputs 2024-11-03 01:07:31 +00:00
Emily
2b2e4d03e3 qt6Packages.qtbase: remove obsolete Darwin flags
Our deployment target is higher than macOS 10.15 now, and it looks
like upstream handle GSS correctly these days.
2024-10-30 05:26:58 +00:00
Emily
5e5aa9dd40 qt6Packages.qtbase: remove obsolete Darwin patch
This is so satisfying to do.
2024-10-30 05:26:58 +00:00
K900
b242971862 qt6.qtwebengine: disable debug info 2024-10-19 22:26:40 +03:00
K900
9c47bda6cc qt6: enable debug info for the rest of them 2024-10-18 10:15:35 +03:00
K900
a07d9f487d
qt6.qtbase: enable debug info (#348759) 2024-10-18 09:59:24 +03:00
K900
229acf3082 qt6.qtbase: fix plugin loading through symlinks 2024-10-18 08:34:27 +03:00
Alyssa Ross
9273569cc1
qt6.qtbase: enable debug info 2024-10-15 12:42:20 +02:00
Emily
19d35002e4 qt6.qtbase: build with apple-sdk_15, propagate apple-sdk_12
As of Qt 6.8, the macOS 15 SDK is supported for building, and support
for targeting macOS 11 has been dropped. (Another good reason for
supporting only 3 to 4 macOS releases.)

Previously the build and target SDKs were swapped, probably because the
dependency lists are in a confusing order. Move them into a central
place to reduce duplication and keep macOS platform support in one
prominent location.

Fixes: 830b9fe572
2024-10-12 04:24:42 +01:00
Randy Eckenrode
0725c33a50
qt6.stdenv: drop overrideSDK
Qt is using the new Darwin SDK, which no longer requires overrideSDK to
change the SDK version or set the deployment target.
2024-10-10 01:13:59 -04:00
Randy Eckenrode
4ec8351095
qt6.qtmultimedia: drop old SDK compatibility patch
Qt Multimediate is being built with a newer SDK that has the new
definition, so don’t bother to patch it out anymore. The symbol is
defined in a backwards compatible way, so it will still work on older
releases that don’t have it in their SDKs.
2024-10-10 01:13:10 -04:00
Randy Eckenrode
4ad6c7f19d
qt6: build Qt 6 modules with the 14.4 SDK
This change ensures all Qt modules build with the latest SDK.
2024-10-10 01:13:10 -04:00
Randy Eckenrode
830b9fe572
qt6.qtbase: build with the 14.4 SDK
Per upstream’s supported Darwin versions, built with the 14.4 SDK
(corresponding to Xcode 15) and a 11.0 deployment target. To ensure that
users of Qt have a compatible SDK and deployment target, propagate the
11.3 SDK and a 11.0 minimum version. Users that need a newer version can
opt into using it by adding the SDK package to their build inputs.
2024-10-10 01:06:45 -04:00
K900
5e1d980f8d qt6: backport fixes for weird list behaviors from 6.8.1
Recommended by Plasma upstream.
2024-10-08 18:06:19 +03:00
K900
10d94780dd qt6: build with Apple SDK 12.3
This is still multiple versions behind where we should be,
but it is the latest we've got (for now, anyway), and 11.0
doesn't build at all.
2024-10-08 15:24:45 +03:00
K900
38fb2331ad maintainers/scripts/fetch-kde-qt.sh: hardcode path instead of using $0 2024-10-08 14:21:49 +03:00
K900
d4f7b842c6 qt6: 6.7.3 -> 6.8.0 2024-10-08 14:21:49 +03:00
K900
6111416de7 qt6.qtbase: propagate cups as host, not as build
I am an idiot and a fool. strictDeps when.
2024-10-01 09:17:37 +03:00
K900
0c0e48b0ec qt6: 6.7.2 -> 6.7.3
- refresh patches for qtbase
- propagate cups for qtprintsupport
- drop merged backports for qtwayland
2024-09-27 21:08:34 +03:00
Artturin
f0e657f3b1 Merge branch 'master' into staging-next 2024-09-25 06:05:01 +03:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Emily
61922738bb treewide: optimistically unpin FFmpeg 7 dependencies
Per the adjusted FFmpeg pinning advice, packages that work on the
default version should use the unversioned variants to ease the
migration to future versions and reduce the number of packages that
end up referencing old versions.

I have left HandBrake pinned as it builds a custom patched FFmpeg.
2024-09-07 20:31:41 +01:00
Yueh-Shun Li
758056dac7 treewide: handle postPhases __structuredAttrs-agnostically
Always specify the postPhases attribute as a list instead of a string.

Append elements to the postPhases Bash variable using appendToVar
instead of string or Bash array concatenation.
2024-09-03 05:56:17 +08:00
Yueh-Shun Li
21c0129841 treewide: handle prePhases __structuredAttrs-agnostically
Always specify the prePhases attribute as a list instead of a string.

Append elements to the prePhases Bash variable using appendToVar
instead of string or Bash array concatenation.
2024-09-03 05:33:59 +08:00
github-actions[bot]
5a1871826e
Merge staging-next into staging 2024-08-29 12:05:39 +00:00
github-actions[bot]
5702f5278f
Merge master into staging-next 2024-08-29 12:05:13 +00:00
K900
416d4d536a qt6.qtwayland: unbork
For some reason qtwayland doesn't fail to configure if it can't find wayland-scanner,
and instead just builds nothing, so this wasn't noticed before.

Propagating wayland-scanner both ways because we need both the tool in /bin and
the protocols in cmake's search path.
2024-08-29 10:29:04 +03:00
rewine
40ff7b87a1 qt6packages.qtwayland: Update wayland.xml to version 1.23.0 2024-08-28 18:41:48 +08:00
Wolfgang Walther
1bcca7d66b
qt: support structuredAttrs in qmake hook
Tested qbs with and without __structuredAttrs.
2024-08-24 12:23:38 +02:00
K900
643f0b1829 qt6.qtdeclarative: slightly less bad hack to make it build on Darwin again 2024-08-12 11:47:03 +03:00
Vladimír Čunát
d4720e9c1e
Merge branch 'staging-next' into staging
There was a nontrivial conflict in pkgs/stdenv/linux/bootstrap-tools*
(reorganizing code vs. modifying it)  I hope I really got it right.
2024-08-05 11:05:55 +02:00
Sigmanificient
63d05d989e pkgs/development: remove unused arguments 2024-08-03 17:18:20 +02:00
K900
a4a42b3aec Merge remote-tracking branch 'origin/staging-next' into staging 2024-08-01 08:57:50 +03:00
Emily
2166381c28 qt6.qtmultimedia: pin FFmpeg 7 for now 2024-07-29 11:07:22 +01:00
Emily
3be3946fc3 {qt5,qt6}.qtwebengine: add patches for FFmpeg 7
Thank you to the Arch package maintainer for incorporating the WebRTC
patches (which I had previously manually added) the day before I went
to clean this up for PRing!
2024-07-29 11:06:59 +01:00
github-actions[bot]
8c2e73a4ed
Merge staging-next into staging 2024-07-26 18:01:39 +00:00
K900
8e7a098243 speechd: introduce minimal variant, use it everywhere 2024-07-26 15:48:11 +03:00
K900
6149730abe kdePackages: fix build under real strictDeps 2024-07-26 08:44:58 +03:00
Randy Eckenrode
f9b7f4ec09
tree-wide: use top-level cctools 2024-07-17 22:36:19 -04:00
Kacper Koniuszy
c67e527a7d qt6packages.qtwayland: pull upstream fixes for crashes on screen changes
Fixes plasmashell crashes described in https://bugs.kde.org/show_bug.cgi?id=489072 and https://bugs.kde.org/show_bug.cgi?id=489180
2024-07-17 08:41:21 +02:00