summary refs log tree commit diff
path: root/doc/languages-frameworks/qt.section.md
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2021-01-12 05:50:23 -0600
committerThomas Tuegel <ttuegel@mailbox.org>2021-01-25 15:56:15 -0600
commit5590e365e4775f138610b1036a75f8886921843e (patch)
tree58f7e1c67fe2fa8328d6db079c1149cd23d17ce0 /doc/languages-frameworks/qt.section.md
parent67b7cffaec76a70db87685ba1b0019107be8272c (diff)
downloadnixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar
nixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar.gz
nixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar.bz2
nixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar.lz
nixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar.xz
nixpkgs-5590e365e4775f138610b1036a75f8886921843e.tar.zst
nixpkgs-5590e365e4775f138610b1036a75f8886921843e.zip
qtbase: Check for wrapQtAppsHook in setupHook
Diffstat (limited to 'doc/languages-frameworks/qt.section.md')
-rw-r--r--doc/languages-frameworks/qt.section.md16
1 files changed, 13 insertions, 3 deletions
diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md
index 966af3b2925..b8b438e8858 100644
--- a/doc/languages-frameworks/qt.section.md
+++ b/doc/languages-frameworks/qt.section.md
@@ -15,13 +15,14 @@ which are not shared by other C++ software:
 
 ```{=docbook}
 <programlisting>
-{ stdenv, lib, qtbase }: <co xml:id='qt-default-nix-co-1' />
+{ stdenv, lib, qtbase, wrapQtAppsHook }: <co xml:id='qt-default-nix-co-1' />
 
 stdenv.mkDerivation {
   pname = "myapp";
   version = "1.0";
 
   buildInputs = [ qtbase ];
+  nativeBuildInputs = [ wrapQtAppsHook ]; <co xml:id'qt-default-nix-co-2' />
 }
 </programlisting>
 
@@ -33,6 +34,13 @@ stdenv.mkDerivation {
     because the Qt versions of dependencies may not be coherent, causing build and runtime failures.
    </para>
   </callout>
+  <callout arearefs="qt-default-nix-co-2'>
+    <para>
+      All Qt packages must include <literal>wrapQtAppsHook</literal> in
+      <literal>nativeBuildInputs</literal>, or you must explicitly set
+      <literal>dontWrapQtApps</literal>.
+    </para>
+  </callout>
  </calloutlist>
 ```
 
@@ -50,7 +58,8 @@ stdenv.mkDerivation {
 }
 ```
 
-Add entries to `qtWrapperArgs` are to modify the wrappers created by `wrapQtAppsHook`:
+Add entries to `qtWrapperArgs` are to modify the wrappers created by
+`wrapQtAppsHook`:
 
 ```nix
 { stdenv, wrapQtAppsHook }:
@@ -65,7 +74,8 @@ stdenv.mkDerivation {
 The entries are passed as arguments to [wrapProgram](#fun-wrapProgram).
 
 Set `dontWrapQtApps` to stop applications from being wrapped automatically.
-Wrap programs manually with `wrapQtApp`, using the syntax of [wrapProgram](#fun-wrapProgram):
+Wrap programs manually with `wrapQtApp`, using the syntax of
+[wrapProgram](#fun-wrapProgram):
 
 ```nix
 { stdenv, lib, wrapQtAppsHook }: