summaryrefslogtreecommitdiffstats
path: root/doc/languages-frameworks
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2024-03-04 10:52:45 +0300
committerGitHub <noreply@github.com>2024-03-04 10:52:45 +0300
commit9bea2c4d938e05bcc11ee45e53d30583229c0945 (patch)
treec5c3f9992d1b065ab21125e13e2efd27a0b3c40f /doc/languages-frameworks
parentbec1afdaeee3a0de9908ef08fd41e935aa077434 (diff)
parentcdc9e1d1008ef3a4fe60098c67c34d1fb3b6e41b (diff)
Merge pull request #293163 from Aleksanaa/doc/qt
doc/qt: minor fixes
Diffstat (limited to 'doc/languages-frameworks')
-rw-r--r--doc/languages-frameworks/qt.section.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md
index 1edceb53cfe4..dcec4b6fff42 100644
--- a/doc/languages-frameworks/qt.section.md
+++ b/doc/languages-frameworks/qt.section.md
@@ -12,7 +12,7 @@ an extra indirection.
## Nix expression for a Qt package (default.nix) {#qt-default-nix}
```nix
-{ stdenv, lib, qt6, wrapQtAppsHook }:
+{ stdenv, qt6 }:
stdenv.mkDerivation {
pname = "myapp";
@@ -23,10 +23,12 @@ stdenv.mkDerivation {
}
```
+The same goes for Qt 5 where libraries and tools are under `libsForQt5`.
+
Any Qt package should include `wrapQtAppsHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers.
::: {.note}
-Graphical Linux applications should also include `qtwayland` in `buildInputs`, to ensure the Wayland platform plugin is available.
+Qt 6 graphical applications should also include `qtwayland` in `buildInputs` on Linux (but not on platforms e.g. Darwin, where `qtwayland` is not available), to ensure the Wayland platform plugin is available.
This may become default in the future, see [NixOS/nixpkgs#269674](https://github.com/NixOS/nixpkgs/pull/269674).
:::