diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-05 00:12:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-05 00:12:06 +0000 |
| commit | 1ad8409e69bd168fbcffb57af8102eaaee4adfa3 (patch) | |
| tree | 462cf7048f7d4f10d3c31d2222ac9c1937c6ec07 /doc/languages-frameworks | |
| parent | 51a22900610b3ba34ee976e56a5ce31954d1adf1 (diff) | |
| parent | 788f65a3d7fdd14bdecf975fd45a9cfd04e367c8 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'doc/languages-frameworks')
| -rw-r--r-- | doc/languages-frameworks/qt.section.md | 6 | ||||
| -rw-r--r-- | doc/languages-frameworks/rust.section.md | 4 |
2 files changed, 6 insertions, 4 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). ::: diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 76ac7b6cb2d2..4ba556c69d5a 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -903,8 +903,8 @@ with import <nixpkgs> }; let rustPlatform = makeRustPlatform { - cargo = rust-bin.stable.latest.minimal; - rustc = rust-bin.stable.latest.minimal; + cargo = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default); + rustc = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default); }; in |